From patchwork Wed Mar 19 14:02:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 26584 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C971920534 for ; Wed, 19 Mar 2014 14:06:11 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id x10sf21002042pdj.6 for ; Wed, 19 Mar 2014 07:06:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references: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=LoW1VWSMzZK2+6wJL45mKgxXmC7ves7ZZlPbrYe/VZE=; b=DsnZyxnv7Cxla4ZojUrpFmznE7xSZm/eTlw3Py23L4YHm6oTCvrwPzUkI3Z4YXIe0T XiIFrpCu8tB5Ukh4JoDZW5nm7jILCqvlCxZ+cIstww/IqaWR6QsILbQgeOQCsXZ+vN50 ykCXZ847j2rxt71CyZUgPYBQgXUKviO9vF3ca2V9yzr7u7hF0zCG6syRO8v0bQauFsiD pBKP4XOqDi4or+wgfkCYVpov5j5DyRCb2yp0aMFlYlhGJEKugb39tNlkMX9gRNp39Brr bl6hxlg/ONM9SPbWvXOW2lAECWQiV7KVarIFpkGlJI5Jo77mGlt+PzJOX7UlJHL4zKRi wIdg== X-Gm-Message-State: ALoCoQlU71SO+/xOZ9SKhWiolNR5tmm5og0WWCDb0nOnV75sbaR9UiVCP13M+xCG0S2/fCltlL1P X-Received: by 10.66.189.163 with SMTP id gj3mr14725135pac.32.1395237971093; Wed, 19 Mar 2014 07:06:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.142 with SMTP id a14ls2593115qgf.31.gmail; Wed, 19 Mar 2014 07:06:10 -0700 (PDT) X-Received: by 10.52.171.68 with SMTP id as4mr25965459vdc.0.1395237970924; Wed, 19 Mar 2014 07:06:10 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id pe7si4467357vec.155.2014.03.19.07.06.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 07:06:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so9239979vcb.15 for ; Wed, 19 Mar 2014 07:06:10 -0700 (PDT) X-Received: by 10.52.142.10 with SMTP id rs10mr25726624vdb.3.1395237970839; Wed, 19 Mar 2014 07:06:10 -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.220.78.9 with SMTP id i9csp302426vck; Wed, 19 Mar 2014 07:06:10 -0700 (PDT) X-Received: by 10.194.9.99 with SMTP id y3mr2378002wja.60.1395237969609; Wed, 19 Mar 2014 07:06:09 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id fc7si14785353wjc.108.2014.03.19.07.06.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Mar 2014 07:06:09 -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]:41572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQH8C-00030Z-15 for patch@linaro.org; Wed, 19 Mar 2014 10:06:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQH5M-0007l2-1i for qemu-devel@nongnu.org; Wed, 19 Mar 2014 10:03:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQH5G-0005z9-CB for qemu-devel@nongnu.org; Wed, 19 Mar 2014 10:03:11 -0400 Received: from afflict.kos.to ([92.243.29.197]:54516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQH5G-0005vK-4f for qemu-devel@nongnu.org; Wed, 19 Mar 2014 10:03:06 -0400 Received: from localhost.localdomain (afflict [92.243.29.197]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 49BC526567; Wed, 19 Mar 2014 15:03:04 +0100 (CET) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Wed, 19 Mar 2014 16:02:59 +0200 Message-Id: <6b1275ff15b205a7738aa8ba96fe355f097b5879.1395237255.git.riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: Peter Maydell , Anthony Liguori Subject: [Qemu-devel] [PULL for-2.0 4/7] linux-user: Don't reserve space for commpage for AArch64 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=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=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: Peter Maydell AArch64 Linux, unlike AArch32, doesn't use a commpage. This means we should not be reserving room in the guest address space for one. Fixes LP:1287195. Reported-by: Amanieu d'Antras Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/elfload.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 6bc7999..99a2c58 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -352,6 +352,9 @@ enum ARM_HWCAP_ARM_VFPv3D16 = 1 << 13, }; +#ifndef TARGET_AARCH64 +/* The commpage only exists for 32 bit kernels */ + #define TARGET_HAS_VALIDATE_GUEST_SPACE /* Return 1 if the proposed guest space is suitable for the guest. * Return 0 if the proposed guest space isn't suitable, but another @@ -411,7 +414,7 @@ static int validate_guest_space(unsigned long guest_base, return 1; /* All good */ } - +#endif #define ELF_HWCAP get_elf_hwcap()