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>
qemu · Aug 13, 2013 · 91f9291 · 91f9291
2 parents 58ef8c5 + 9975e99
commit 91f9291
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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);
 }