proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-15 10:10:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target-i386: Set level=4 on Conroe/Penryn/Nehalem

Browse Source 
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 <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2013-05-27 17:23:55 -03:00 committed by Andreas Färber
parent ffce9ebbb6
commit 6b11322e0f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/hw/i386/pc.h
View File

@ -190,14 +190,26 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
.driver = "Conroe-" TYPE_X86_CPU,\ .driver = "Conroe-" TYPE_X86_CPU,\
.property = "model",\ .property = "model",\
.value = stringify(2),\ .value = stringify(2),\
},{\
.driver = "Conroe-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(2),\
},{\ },{\
.driver = "Penryn-" TYPE_X86_CPU,\ .driver = "Penryn-" TYPE_X86_CPU,\
.property = "model",\ .property = "model",\
.value = stringify(2),\ .value = stringify(2),\
},{\
.driver = "Penryn-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(2),\
},{\ },{\
.driver = "Nehalem-" TYPE_X86_CPU,\ .driver = "Nehalem-" TYPE_X86_CPU,\
.property = "model",\ .property = "model",\
.value = stringify(2),\ .value = stringify(2),\
},{\
.driver = "Nehalem-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(2),\
} }
#define PC_COMPAT_1_4 \ #define PC_COMPAT_1_4 \

6
target-i386/cpu.c
View File

@ -669,7 +669,7 @@ static x86_def_t builtin_x86_defs[] = {
}, },
{ {
.name = "Conroe", .name = "Conroe",
.level = 2, .level = 4,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
.model = 15, .model = 15,
@ -691,7 +691,7 @@ static x86_def_t builtin_x86_defs[] = {
}, },
{ {
.name = "Penryn", .name = "Penryn",
.level = 2, .level = 4,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
.model = 23, .model = 23,
@ -714,7 +714,7 @@ static x86_def_t builtin_x86_defs[] = {
}, },
{ {
.name = "Nehalem", .name = "Nehalem",
.level = 2, .level = 4,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
.model = 26, .model = 26,