From patchwork Wed Mar 6 02:01:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 225248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A9CE32C0361 for ; Wed, 6 Mar 2013 13:04:58 +1100 (EST) Received: from localhost ([::1]:51878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD3iy-0005xL-Hb for incoming@patchwork.ozlabs.org; Tue, 05 Mar 2013 21:04:56 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD3fd-0008VI-Ey for qemu-devel@nongnu.org; Tue, 05 Mar 2013 21:01:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UD3fW-00064i-TZ for qemu-devel@nongnu.org; Tue, 05 Mar 2013 21:01:29 -0500 Received: from cantor2.suse.de ([195.135.220.15]:43327 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD3fW-00064G-NI for qemu-devel@nongnu.org; Tue, 05 Mar 2013 21:01:22 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2EF09A5211; Wed, 6 Mar 2013 03:01:21 +0100 (CET) From: Alexander Graf To: qemu-devel qemu-devel Date: Wed, 6 Mar 2013 03:01:14 +0100 Message-Id: <1362535280-5068-7-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1362535280-5068-1-git-send-email-agraf@suse.de> References: <1362535280-5068-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Peter Maydell , Riku Voipio Subject: [Qemu-devel] [PATCH 06/12] linux-user: Don't treat aarch64 cpu names specially 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 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 --- linux-user/cpu-uname.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/linux-user/cpu-uname.c b/linux-user/cpu-uname.c index 59cd647..50231c1 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_ARM64) + /* 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