diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2013-05-27 17:23:54 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-06-10 23:33:18 +0200 |
| commit | ffce9ebbb69363dfe7605585cdad58ea3847edf4 (patch) | |
| tree | fc8050aa559872dcbb137459ed2703f961b7fab9 /include/hw/i386 | |
| parent | 45053fdef54fa9aac1cc9b09f2a1d08af90b7b43 (diff) | |
| download | qemu-ffce9ebbb69363dfe7605585cdad58ea3847edf4.tar.gz qemu-ffce9ebbb69363dfe7605585cdad58ea3847edf4.tar.bz2 qemu-ffce9ebbb69363dfe7605585cdad58ea3847edf4.zip | |
target-i386: Update model values on Conroe/Penryn/Nehalem CPU models
The CPUID model values on Conroe, Penryn, and Nehalem are too
conservative and don't reflect the values found on real Conroe, Penryn,
and Nehalem CPUs.
This causes at least one known problems: Windows XP disables sysenter
when (family == 6 && model <= 2), but Skype tries to use the sysenter
instruction anyway because it is reported as available on CPUID, making
it crash.
This patch sets appropriate model values that correspond to real Conroe,
Penryn, and Nehalem CPUs.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'include/hw/i386')
| -rw-r--r-- | include/hw/i386/pc.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 61540587a4..f232d75605 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -185,7 +185,23 @@ int pvpanic_init(ISABus *bus); int e820_add_entry(uint64_t, uint64_t, uint32_t); +#define PC_COMPAT_1_5 \ + {\ + .driver = "Conroe-" TYPE_X86_CPU,\ + .property = "model",\ + .value = stringify(2),\ + },{\ + .driver = "Penryn-" TYPE_X86_CPU,\ + .property = "model",\ + .value = stringify(2),\ + },{\ + .driver = "Nehalem-" TYPE_X86_CPU,\ + .property = "model",\ + .value = stringify(2),\ + } + #define PC_COMPAT_1_4 \ + PC_COMPAT_1_5, \ {\ .driver = "scsi-hd",\ .property = "discard_granularity",\ |