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: 54432 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 7A7E323009 for ; Fri, 2 Oct 2015 13:47:06 +0000 (UTC) Received: by lbwr8 with SMTP id r8sf16755688lbw.0 for ; Fri, 02 Oct 2015 06:47:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding:cc :subject:precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=8L6uUMAdTjDuuSjVzf/GLKCzMzqw20jeuJvniJITz3s=; b=Fy1gmaUMFv0nuEs304ZD28oWyq/1/IqSyLUHxfwYgtMFnVOVqfgt6ZdVFHMhxvT6Nm osbwLtYVlOWi6ydvMcB7upUCUE4q/nAR9wKySnei1K+o5uZQpsdJbj8PN21+l5iuqI3v VIGFJL80f91Aj3Gpz+mng7TfbfrjlNcgnzb2WpsbdeShXFDB47q00SSEu+Jl7n8zVnGD MWts9Mw9yqlFqCcWvpXMCvm2EOjRCXGo2vUaxRSF766sNaqvm1AH9y3y0fJ7pRSeFkws u3rkNdCyv0bhyZYAJAWVwwuZyx4FjuIGt0SrWAZt0m/A3zP40ZJ0Ka1OX4chDJz5Enmg /gJQ== X-Gm-Message-State: ALoCoQk7urEJlq9rFGF92q/0Tj9G9XLvPJxKNkySJKC2Qf1oHjfwkS8dfFNo58l0Wp4mf6xtpeyV X-Received: by 10.112.202.165 with SMTP id kj5mr2605966lbc.5.1443793625407; Fri, 02 Oct 2015 06:47:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.44.79 with SMTP id s76ls236936lfs.29.gmail; Fri, 02 Oct 2015 06:47:05 -0700 (PDT) X-Received: by 10.25.17.94 with SMTP id g91mr3686132lfi.12.1443793625121; Fri, 02 Oct 2015 06:47:05 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id l131si6308933lfl.9.2015.10.02.06.47.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2015 06:47:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by labzv5 with SMTP id zv5so93183018lab.1 for ; Fri, 02 Oct 2015 06:47:05 -0700 (PDT) X-Received: by 10.112.64.72 with SMTP id m8mr5527455lbs.41.1443793624979; Fri, 02 Oct 2015 06:47:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1256265lbq; Fri, 2 Oct 2015 06:47:03 -0700 (PDT) X-Received: by 10.140.148.204 with SMTP id 195mr21095563qhu.6.1443793623631; Fri, 02 Oct 2015 06:47:03 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g90si10341377qge.81.2015.10.02.06.47.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 02 Oct 2015 06:47:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:59885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi0fv-0004b6-5V for patch@linaro.org; Fri, 02 Oct 2015 09:47:03 -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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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;