From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UbmiT-0000Wu-Tr for qemu-devel@nongnu.org; Mon, 13 May 2013 02:58:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UbmiQ-0000TW-5m for qemu-devel@nongnu.org; Mon, 13 May 2013 02:58:37 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:54311) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UbmiQ-0000S4-0q for qemu-devel@nongnu.org; Mon, 13 May 2013 02:58:34 -0400 Received: by mail-pa0-f41.google.com with SMTP id rl6so4420559pac.14 for ; Sun, 12 May 2013 23:58:33 -0700 (PDT) From: John Rigby Date: Mon, 13 May 2013 00:57:52 -0600 Message-Id: <1368428278-29299-6-git-send-email-john.rigby@linaro.org> In-Reply-To: <1368428278-29299-1-git-send-email-john.rigby@linaro.org> References: <1368428278-29299-1-git-send-email-john.rigby@linaro.org> Subject: [Qemu-devel] [PATCH v3 resend 05/11] linux-user: Don't treat aarch64 cpu names specially List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: 'Peter Maydell , John Rigby , Riku Voipio , Alexander Graf 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 --- 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 59cd647..89bdb91 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 -- 1.8.2.2