From patchwork Tue Sep 3 19:12:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 19722 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 921BD24869 for ; Tue, 3 Sep 2013 19:12:37 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id u18sf145292qcx.6 for ; Tue, 03 Sep 2013 12:12:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=UTFCEnIx/y/ATJXjaFDgd3YMz3S2G251+XP+Rx6kfks=; b=L7UrslqJ9G6Gpcc2qdIEdkpgg7v0RZSPxUkSOFp7wSNVKF31s/u8JxksWfC/gZtfx0 0ZTbTHVyNWNqX+Vm1bq4zmsq6dkSZZgO+WhlMEyBBhKWXSdSd38X48jcvuHfo32hT9WF buiwqr736FqCpqHMlIh7VcP3TihyuIWmRXUeFzXAA8AMPHXBrCsKF397lK5ju1pomZVR 6hOZjcFYLCKk6/JkZrMGLrS0s15M5jpTagG/OZskKFShO0mT+9u75elA4ZRxzZf01t6Y Ky+NbAZVaJw2fFK1om5HSENm/jKPjChdEeO+cOeinTenMD4Zd4LafGSuvhtbJf6yFq4p p7gA== X-Received: by 10.236.32.74 with SMTP id n50mr10935669yha.13.1378235557430; Tue, 03 Sep 2013 12:12:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.28.10 with SMTP id x10ls892376qeg.20.gmail; Tue, 03 Sep 2013 12:12:37 -0700 (PDT) X-Received: by 10.220.10.194 with SMTP id q2mr29231359vcq.2.1378235557346; Tue, 03 Sep 2013 12:12:37 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id l8si4797643vez.124.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Sep 2013 12:12:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 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.179; Received: by mail-vc0-f179.google.com with SMTP id ht10so4181581vcb.24 for ; Tue, 03 Sep 2013 12:12:37 -0700 (PDT) X-Gm-Message-State: ALoCoQleMXCmQgycZNLnwdMF6rQPYVWPwvRzn/sbFkeu9tUhzu9w82Y6Mg927WUhXeeOFlL900lN X-Received: by 10.58.171.4 with SMTP id aq4mr2577914vec.26.1378235557266; Tue, 03 Sep 2013 12:12:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp190468vcz; Tue, 3 Sep 2013 12:12:36 -0700 (PDT) X-Received: by 10.180.93.8 with SMTP id cq8mr15841965wib.38.1378235545869; Tue, 03 Sep 2013 12:12:25 -0700 (PDT) Received: from chiark.greenend.org.uk (v6.chiark.greenend.org.uk. [2001:ba8:1e3::]) by mx.google.com with ESMTPS id q4si2456614wiw.81.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 03 Sep 2013 12:12:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pmaydell@chiark.greenend.org.uk designates 2001:ba8:1e3:: as permitted sender) client-ip=2001:ba8:1e3::; Received: by chiark.greenend.org.uk (Debian Exim 4.72 #1) with local (return-path pmaydell@chiark.greenend.org.uk) id 1VGw1Y-0005oJ-GI; Tue, 03 Sep 2013 20:12:24 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Andreas Schwab , Alexander Graf , "Mian M. Hamayun" , kvmarm@lists.cs.columbia.edu, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH v6 12/24] linux-user: Don't treat AArch64 cpu names specially Date: Tue, 3 Sep 2013 20:12:12 +0100 Message-Id: <1378235544-22290-13-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1378235544-22290-1-git-send-email-peter.maydell@linaro.org> References: <1378235544-22290-1-git-send-email-peter.maydell@linaro.org> Sender: Peter Maydell X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Alexander Graf 32-bit ARM has a lot of different names for different types of CPUs it supports. On AArch64, we don't have this, so we really don't want to execute the 32-bit logic. Stub it out for AArch64 linux-user guests. Signed-off-by: Alexander Graf Signed-off-by: John Rigby Message-id: 1368505980-17151-7-git-send-email-john.rigby@linaro.org Signed-off-by: Peter Maydell --- linux-user/cpu-uname.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-user/cpu-uname.c b/linux-user/cpu-uname.c index cc713e6..5db6e89 100644 --- a/linux-user/cpu-uname.c +++ b/linux-user/cpu-uname.c @@ -30,7 +30,8 @@ * return here */ const char *cpu_to_uname_machine(void *cpu_env) { -#ifdef TARGET_ARM +#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + /* utsname machine name on linux arm is CPU arch name + endianness, e.g. * armv7l; to get a list of CPU arch names from the linux source, use: * grep arch_name: -A1 linux/arch/arm/mm/proc-*.S