From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NWTg6-0000yT-7C for qemu-devel@nongnu.org; Sun, 17 Jan 2010 06:52:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NWTg1-0000wp-9h for qemu-devel@nongnu.org; Sun, 17 Jan 2010 06:52:21 -0500 Received: from [199.232.76.173] (port=43198 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWTg1-0000wj-4R for qemu-devel@nongnu.org; Sun, 17 Jan 2010 06:52:17 -0500 Received: from duck.dooz.org ([194.146.227.125]:36431) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NWTg0-0007iK-DZ for qemu-devel@nongnu.org; Sun, 17 Jan 2010 06:52:16 -0500 Date: Sun, 17 Jan 2010 12:52:06 +0100 From: =?iso-8859-1?Q?Lo=EFc?= Minier Subject: Re: [Qemu-devel] [PATCH] linux-user: adapt uname machine to emulated CPU Message-ID: <20100117115206.GA23875@bee.dooz.org> References: <20091229213921.GA14667@bee.dooz.org> <20100114150712.GB16630@volta.aurel32.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="82I3+IH0IqGh5yIs" Content-Disposition: inline In-Reply-To: <20100114150712.GB16630@volta.aurel32.net> Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aurelien Jarno Cc: qemu-devel@nongnu.org --82I3+IH0IqGh5yIs Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 14, 2010, Aurelien Jarno wrote: > This patch look ok, but is missing a Signed-off-by: Attaching a rebased patch with a Signed-off-by. [ I didn't retest, but it applied without any merge issue and there was only two (arch-specific) commits in linux-user since the previous version. ] Thanks, --=20 Lo=EFc Minier --82I3+IH0IqGh5yIs Content-Type: text/x-diff; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-linux-user-adapt-uname-machine-to-emulated-CPU.patch" Content-Transfer-Encoding: quoted-printable >>From c4396cafac0041cfa2fed686f935e9df3636e05b Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Lo=3DC3=3DAFc=3D20Minier?=3D Date: Tue, 29 Dec 2009 22:06:13 +0100 Subject: [PATCH] linux-user: adapt uname machine to emulated CPU --- Makefile.target | 2 +- linux-user/cpu-uname.c | 72 ++++++++++++++++++++++++++++++++++++++++++= ++++++ linux-user/cpu-uname.h | 1 + linux-user/syscall.c | 3 +- 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 linux-user/cpu-uname.c create mode 100644 linux-user/cpu-uname.h diff --git a/Makefile.target b/Makefile.target index e661478..9f5bd17 100644 --- a/Makefile.target +++ b/Makefile.target @@ -95,7 +95,7 @@ $(call set-vpath, $(SRC_PATH)/linux-user:$(SRC_PATH)/li= nux-user/$(TARGET_ABI_DIR =20 QEMU_CFLAGS+=3D-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGE= T_ABI_DIR) obj-y =3D main.o syscall.o strace.o mmap.o signal.o thunk.o \ - elfload.o linuxload.o uaccess.o gdbstub.o + elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o =20 obj-$(TARGET_HAS_BFLT) +=3D flatload.o obj-$(TARGET_HAS_ELFLOAD32) +=3D elfload32.o diff --git a/linux-user/cpu-uname.c b/linux-user/cpu-uname.c new file mode 100644 index 0000000..ddc37be --- /dev/null +++ b/linux-user/cpu-uname.c @@ -0,0 +1,72 @@ +/* + * cpu to uname machine name map + * + * Copyright (c) 2009 Lo=EFc Minier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include + +#include "qemu.h" +//#include "qemu-common.h" +#include "cpu-uname.h" + +/* return highest utsname machine name for emulated instruction set + * + * NB: the default emulated CPU ("any") might not match any existing CPU= , e.g. + * on ARM it has all features turned on, so there is no perfect arch str= ing to + * return here */ +const char *cpu_to_uname_machine(void *cpu_env) +{ +#ifdef TARGET_ARM + /* 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, us= e: + * grep arch_name: -A1 linux/arch/arm/mm/proc-*.S + * see arch/arm/kernel/setup.c: setup_processor() + * + * to test by CPU id, compare cpu_env->cp15.c0_cpuid to ARM_CPUID_* + * defines and to test by CPU feature, use arm_feature(cpu_env, + * ARM_FEATURE_*) */ + + /* in theory, endianness is configurable on some ARM CPUs, but this = isn't + * used in user mode emulation */ +#ifdef TARGET_WORDS_BIGENDIAN +#define utsname_suffix "b" +#else +#define utsname_suffix "l" +#endif + if (arm_feature(cpu_env, ARM_FEATURE_V7)) + return "armv7" utsname_suffix; + if (arm_feature(cpu_env, ARM_FEATURE_V6)) + return "armv6" utsname_suffix; + /* 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) + /* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 = */ + uint32_t cpuid_version =3D ((CPUX86State *)cpu_env)->cpuid_version; + int family =3D ((cpuid_version >> 8) & 0x0f) + ((cpuid_version >> 20= ) & 0xff); + if (family =3D=3D 4) + return "i486"; + if (family =3D=3D 5) + return "i586"; + return "i686"; +#else + /* default is #define-d in each arch/ subdir */ + return UNAME_MACHINE; +#endif +} diff --git a/linux-user/cpu-uname.h b/linux-user/cpu-uname.h new file mode 100644 index 0000000..32492de --- /dev/null +++ b/linux-user/cpu-uname.h @@ -0,0 +1 @@ +const char *cpu_to_uname_machine(void *cpu_env); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index f2dd39e..9fb493f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -82,6 +82,7 @@ #include #include #include "linux_loop.h" +#include "cpu-uname.h" =20 #include "qemu.h" #include "qemu-common.h" @@ -5739,7 +5740,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_lon= g arg1, if (!is_error(ret)) { /* Overrite the native machine name with whatever is bei= ng emulated. */ - strcpy (buf->machine, UNAME_MACHINE); + strcpy (buf->machine, cpu_to_uname_machine(cpu_env)); /* Allow the user to override the reported release. */ if (qemu_uname_release && *qemu_uname_release) strcpy (buf->release, qemu_uname_release); --=20 1.6.5 --82I3+IH0IqGh5yIs--