The CPUID level value on Conroe, Penryn, and Nehalem are too low. This causes at least one known problem: the -smp "threads" option doesn't work as expect if level is < 4, because thread count information is provided to the guest on CPUID[EAX=4,ECX=2].EAX
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- Testing: those level values have been in use on Red Hat Enterprise Linux since version 6.0 (released in 2010). The fix wasn't submitted to QEMU earlier because we didn't have a good mechanism and clear procedure to update CPUID values of existing CPU models in QEMU. --- include/hw/i386/pc.h | 12 ++++++++++++ target-i386/cpu.c | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8883b37..4351f39 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -188,13 +188,25 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); .property = "model",\ .value = stringify(2),\ },{\ + .driver = "Conroe-" TYPE_X86_CPU,\ + .property = "level",\ + .value = stringify(2),\ + },{\ .driver = "Penryn-" TYPE_X86_CPU,\ .property = "model",\ .value = stringify(2),\ },{\ + .driver = "Penryn-" TYPE_X86_CPU,\ + .property = "level",\ + .value = stringify(2),\ + },{\ .driver = "Nehalem-" TYPE_X86_CPU,\ .property = "model",\ .value = stringify(2),\ + },{\ + .driver = "Nehalem-" TYPE_X86_CPU,\ + .property = "level",\ + .value = stringify(2),\ } #define PC_COMPAT_1_4 \ diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 6b48562..762baad 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -669,7 +669,7 @@ static x86_def_t builtin_x86_defs[] = { }, { .name = "Conroe", - .level = 2, + .level = 4, .vendor = CPUID_VENDOR_INTEL, .family = 6, .model = 15, @@ -691,7 +691,7 @@ static x86_def_t builtin_x86_defs[] = { }, { .name = "Penryn", - .level = 2, + .level = 4, .vendor = CPUID_VENDOR_INTEL, .family = 6, .model = 23, @@ -714,7 +714,7 @@ static x86_def_t builtin_x86_defs[] = { }, { .name = "Nehalem", - .level = 2, + .level = 4, .vendor = CPUID_VENDOR_INTEL, .family = 6, .model = 26, -- 1.8.1.4