From patchwork Fri Oct 2 13:00:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 525537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9A6DB140D8A for ; Fri, 2 Oct 2015 23:46:38 +1000 (AEST) Received: from localhost ([::1]:59885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi0fU-0004b6-BV for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2015 09:46:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zhzxh-0005Lp-Ef for qemu-devel@nongnu.org; Fri, 02 Oct 2015 09:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zhzxd-0000c2-9G for qemu-devel@nongnu.org; Fri, 02 Oct 2015 09:01:21 -0400 Received: from mail-la0-f44.google.com ([209.85.215.44]:36468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zhzxd-0000bZ-1s for qemu-devel@nongnu.org; Fri, 02 Oct 2015 09:01:17 -0400 Received: by laclj5 with SMTP id lj5so92036681lac.3 for ; Fri, 02 Oct 2015 06:01:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=8L6uUMAdTjDuuSjVzf/GLKCzMzqw20jeuJvniJITz3s=; b=VaKr1ZL6PG9vb3faBSpHu9RnYe+FztMIyGRU7wARoi2NoozgBvfJJIwDDeebF/zG+O ILQzXk50TJA7KZ1TRCyRLDQm9IKX2cKvvS2rlQ7YIJsGZ8KrqysuVt3hnE6sX0jHg81w LpQNC2s7yisMwZuFnF93BGtkei5w4nOvLr4r7+kVbAYgfJLId2/TdYTdz0p6aQ76wK+l c+oEIdT2IuYa32qkPaj1gIV8RBWbNGjkMs2ExtvERdRF+si2v7aAeE+RA0PV0+zS5ij/ vEURxpg8jTC/vzyDhub025gpjnrJfvIeUBbeAyZykNZUmr53iWlvr5ZOkHCj0RGNo7Tp 6lwA== X-Gm-Message-State: ALoCoQmFa6qzpc13qgCXdmtZmfTiS94ZW5b/EE23DwzLSIX+aJ8x3CnjN/MBikI1WJbGVu7DckuB X-Received: by 10.25.38.9 with SMTP id m9mr3476087lfm.112.1443790876329; Fri, 02 Oct 2015 06:01:16 -0700 (PDT) Received: from localhost.localdomain (91-157-196-38.elisa-laajakaista.fi. [91.157.196.38]) by smtp.gmail.com with ESMTPSA id w143sm1514751lfd.2.2015.10.02.06.01.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Oct 2015 06:01:15 -0700 (PDT) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 2 Oct 2015 16:00:58 +0300 Message-Id: <84646ee25b68321624ef4768011e91064e4bd440.1443790691.git.riku.voipio@linaro.org> X-Mailer: git-send-email 2.5.3 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.215.44 Cc: =?UTF-8?q?Stefan=20Br=C3=BCns?= Subject: [Qemu-devel] [PULL 06/13] linux-user: remove unused image_info members X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stefan Brüns Reviewed-by: Peter Maydell Signed-off-by: Stefan Brüns Signed-off-by: Riku Voipio --- linux-user/elfload.c | 3 --- linux-user/qemu.h | 2 -- 2 files changed, 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a7ff58c..ad46530 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1455,7 +1455,6 @@ static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm, for (i = 0 ; i < MAX_ARG_PAGES ; i++) { if (bprm->page[i]) { - info->rss++; /* FIXME - check return value of memcpy_to_target() for failure */ memcpy_to_target(stack_base, bprm->page[i], TARGET_PAGE_SIZE); g_free(bprm->page[i]); @@ -2206,8 +2205,6 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) char *elf_interpreter = NULL; info->start_mmap = (abi_ulong)ELF_START_MMAP; - info->mmap = 0; - info->rss = 0; load_elf_image(bprm->filename, bprm->fd, info, &elf_interpreter, bprm->buf); diff --git a/linux-user/qemu.h b/linux-user/qemu.h index e8606b2..678e5d6 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -36,8 +36,6 @@ struct image_info { abi_ulong start_brk; abi_ulong brk; abi_ulong start_mmap; - abi_ulong mmap; - abi_ulong rss; abi_ulong start_stack; abi_ulong stack_limit; abi_ulong entry;