diff options
| author | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-08-13 13:09:23 -0500 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-08-13 13:10:17 -0500 |
| commit | 91f92915f96e7e837df39a010170b3d0c534caac (patch) | |
| tree | 83702c2dada0a6cd8b59d0d83e17d920179845ba | |
| parent | 58ef8c530ca5d265f575ef88e93c0214d5740b0a (diff) | |
| parent | 9975e9916e70933315441616860a4b555b825e0d (diff) | |
| download | qemu-91f92915f96e7e837df39a010170b3d0c534caac.tar.gz | |
Merge tag 'qom-cpu-for-1.5' into stable-1.5-staging
QOM CPUState and X86CPU for stable-1.5
* Fix X86CPU Westmere CPUID for pc-*-1.4 and older
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/i386/pc_piix.c | 1 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 06416ce74f..aa03436d05 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -250,6 +250,7 @@ static void pc_init_pci_1_4(QEMUMachineInitArgs *args) { has_pvpanic = false; x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); pc_init_pci(args); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 7888dfe03f..1cceeb08a1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -212,6 +212,7 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args) { has_pvpanic = false; x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); pc_q35_init(args); } |