From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 12 Aug 2013 20:03:20 +0000 (-0500)
Subject: Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9d054ea543c2f94ddea5db29cc908899a188c07d;p=qemu-upstream-4.5-testing.git

Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging

QOM CPUState refactorings

* Fix X86CPU Westmere CPUID for pc-*-1.4 and older

* afaerber/tags/qom-cpu-for-anthony:
  pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older

Conflicts:
	hw/i386/pc_piix.c
	hw/i386/pc_q35.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

9d054ea543c2f94ddea5db29cc908899a188c07d
diff --cc hw/i386/pc_piix.c
index 7ad7c0b12,1329f970a..55c24f2f6
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@@ -263,9 -263,10 +263,10 @@@ static void pc_init_pci_1_5(QEMUMachine
  
  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_1_5(args);
 +    has_pci_info = false;
 +    pc_init_pci(args);
  }
  
  static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
diff --cc hw/i386/pc_q35.c
index 6c7b40127,1d84ead9e..bd250718f
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@@ -232,9 -231,10 +232,10 @@@ static void pc_q35_init_1_5(QEMUMachine
  
  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_1_5(args);
 +    has_pci_info = false;
 +    pc_q35_init(args);
  }
  
  static QEMUMachine pc_q35_machine_v1_6 = {