From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkuOA-0000Id-7B for qemu-devel@nongnu.org; Fri, 16 Sep 2016 10:45:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkuO6-0008QC-2K for qemu-devel@nongnu.org; Fri, 16 Sep 2016 10:45:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkuKs-000614-K6 for qemu-devel@nongnu.org; Fri, 16 Sep 2016 10:45:09 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Fri, 16 Sep 2016 18:41:32 +0400 Message-Id: <20160916144132.31416-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] RFC: linux-user-i386: crash on cpuid List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Running cpuid instructions with a simple run like: i386-linux-user/qemu-i386 tests/tcg/sha1-i386 Results in the following assert: #0 0x00007ffff64246f5 in raise () from /lib64/libc.so.6 #1 0x00007ffff64262fa in abort () from /lib64/libc.so.6 #2 0x00007ffff7937ec5 in g_assertion_message () from /lib64/libglib-2.0= .so.0 #3 0x00007ffff7937f5a in g_assertion_message_expr () from /lib64/libgli= b-2.0.so.0 #4 0x000055555561b54c in apicid_bitwidth_for_count (count=3D0) at /home= /elmarco/src/qemu/include/hw/i386/topology.h:58 #5 0x000055555561b58a in apicid_smt_width (nr_cores=3D0, nr_threads=3D0= ) at /home/elmarco/src/qemu/include/hw/i386/topology.h:67 #6 0x000055555561b5c3 in apicid_core_offset (nr_cores=3D0, nr_threads=3D= 0) at /home/elmarco/src/qemu/include/hw/i386/topology.h:82 #7 0x000055555561b5e3 in apicid_pkg_offset (nr_cores=3D0, nr_threads=3D= 0) at /home/elmarco/src/qemu/include/hw/i386/topology.h:89 #8 0x000055555561dd86 in cpu_x86_cpuid (env=3D0x555557999550, index=3D4= , count=3D3, eax=3D0x7fffffffcae8, ebx=3D0x7fffffffcaec, ecx=3D0x7fffffff= caf0, edx=3D0x7fffffffcaf4) at /home/elmarco/src/qemu/target-i386/cpu.c:2= 405 #9 0x0000555555638e8e in helper_cpuid (env=3D0x555557999550) at /home/e= lmarco/src/qemu/target-i386/misc_helper.c:106 #10 0x000055555599dc5e in static_code_gen_buffer () #11 0x00005555555952f8 in cpu_tb_exec (cpu=3D0x5555579912d0, itb=3D0x7ff= ff4371ab0) at /home/elmarco/src/qemu/cpu-exec.c:166 #12 0x0000555555595c8e in cpu_loop_exec_tb (cpu=3D0x5555579912d0, tb=3D0= x7ffff4371ab0, last_tb=3D0x7fffffffd088, tb_exit=3D0x7fffffffd084, sc=3D0= x7fffffffd0a0) at /home/elmarco/src/qemu/cpu-exec.c:517 #13 0x0000555555595e50 in cpu_exec (cpu=3D0x5555579912d0) at /home/elmar= co/src/qemu/cpu-exec.c:612 #14 0x00005555555c065b in cpu_loop (env=3D0x555557999550) at /home/elmar= co/src/qemu/linux-user/main.c:297 #15 0x00005555555c25b2 in main (argc=3D2, argv=3D0x7fffffffd848, envp=3D= 0x7fffffffd860) at /home/elmarco/src/qemu/linux-user/main.c:4803 The fields are set in qemu_init_vcpu() with softmmu, but it's a stub with linux-user. Signed-off-by: Marc-Andr=C3=A9 Lureau --- target-i386/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 5a5299a..ce8f798 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3097,7 +3097,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Er= ror **errp) =20 mce_init(cpu); =20 -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + cs->nr_cores =3D smp_cores; + cs->nr_threads =3D smp_threads; +#else if (tcg_enabled()) { AddressSpace *newas =3D g_new(AddressSpace, 1); =20 --=20 2.10.0