From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRj7r-0000Ix-0r for qemu-devel@nongnu.org; Mon, 04 Jan 2010 04:21:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRj7p-0000Ig-Sf for qemu-devel@nongnu.org; Mon, 04 Jan 2010 04:21:22 -0500 Received: from [199.232.76.173] (port=34447 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRj7p-0000Id-Np for qemu-devel@nongnu.org; Mon, 04 Jan 2010 04:21:21 -0500 Received: from afflict.kos.to ([92.243.29.197]:58226) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NRj7p-0004NZ-H9 for qemu-devel@nongnu.org; Mon, 04 Jan 2010 04:21:21 -0500 Date: Mon, 4 Jan 2010 11:21:18 +0200 From: Riku Voipio Subject: Re: [Qemu-devel] [PATCH] linux-user: adapt uname machine to emulated CPU Message-ID: <20100104092118.GA31437@kos.to> References: <20091229213921.GA14667@bee.dooz.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20091229213921.GA14667@bee.dooz.org> Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?B?TG/Dr2M=?= Minier Cc: qemu-devel@nongnu.org Hi, Works great, thanks. Acked-By: Riku Voipio On Tue, Dec 29, 2009 at 10:39:21PM +0100, Lo=C3=AFc Minier wrote: > Hey there >=20 > This patch for linux-user adapts the output of the emulated uname() > syscall to match the configured CPU. Tested with x86, x86-64 and arm > emulation. >=20 > Thanks, >=20 >=20 > --- > 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 >=20 > diff --git a/Makefile.target b/Makefile.target > index 7c1f30c..6414472 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -90,7 +90,7 @@ ifdef CONFIG_LINUX_USER > VPATH+=3D:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_D= IR) > QEMU_CFLAGS+=3D-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TAR= GET_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=C3=AFc Minier > + * > + * This program is free software; you can redistribute it and/or modi= fy > + * 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 C= PU, e.g. > + * on ARM it has all features turned on, so there is no perfect arch s= tring 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, = use: > + * 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 thi= s 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, bu= t 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, 68= 6 */ > + 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 1acf1f5..9e2e89a 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_l= ong arg1, > if (!is_error(ret)) { > /* Overrite the native machine name with whatever is b= eing > 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 >=20 >=20 > --=20 > Lo=C3=AFc Minier >=20