From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Alexander Graf Date: Wed, 6 Mar 2013 03:01:14 +0100 Message-Id: <1362535280-5068-7-git-send-email-agraf@suse.de> In-Reply-To: <1362535280-5068-1-git-send-email-agraf@suse.de> References: <1362535280-5068-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 06/12] linux-user: Don't treat aarch64 cpu names specially List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel qemu-devel Cc: Peter Maydell , Riku Voipio 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 -- 1.6.0.2