From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwuoz-0005hW-0G for qemu-devel@nongnu.org; Tue, 17 Jun 2014 10:57:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wwuos-0004QW-9Z for qemu-devel@nongnu.org; Tue, 17 Jun 2014 10:57:12 -0400 Received: from afflict.kos.to ([92.243.29.197]:46244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwuos-0004PB-2a for qemu-devel@nongnu.org; Tue, 17 Jun 2014 10:57:06 -0400 From: riku.voipio@linaro.org Date: Tue, 17 Jun 2014 17:56:57 +0300 Message-Id: <4d13be8b8b817cbca7db2f880628d7ae5b74799f.1403016610.git.riku.voipio@linaro.org> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PULL v2 14/17] linux-user/uname: Return correct uname string for x86_64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org From: Peter Maydell We were returning the incorrect uname string (with a hyphen, not an underscore) for x86_64. Fix this by removing the x86_64 special case, since the default "just use UNAME_MACHINE" behaviour suffices. This leaves cpu_to_uname_machine() special cases for only those architectures which need to vary the string based on runtime CPU features. Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/uname.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/linux-user/uname.c b/linux-user/uname.c index f5d4c66..1e6560d 100644 --- a/linux-user/uname.c +++ b/linux-user/uname.c @@ -52,9 +52,7 @@ const char *cpu_to_uname_machine(void *cpu_env) /* earliest emulated CPU is ARMv5TE; qemu can emulate the 1026, but not its * Jazelle support */ return "armv5te" utsname_suffix; -#elif defined(TARGET_X86_64) - return "x86-64"; -#elif defined(TARGET_I386) +#elif defined(TARGET_I386) && !defined(TARGET_X86_64) /* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 */ CPUState *cpu = ENV_GET_CPU((CPUX86State *)cpu_env); int family = object_property_get_int(OBJECT(cpu), "family", NULL); -- 2.0.0.rc2