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>

diff --cc hw/i386/pc_piix.c
index 7ad7c0b12110cbe89c8d42c85d2a70b707ef149d,1329f970a9709ca58b85bfbed2badd02f84af837..55c24f2f6f609f5ef72bf89f55ac36961164660d
--- 1/hw/i386/pc_piix.c
--- 2/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);
 -    pc_init_pci_1_5(args);
+     x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
 +    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 6c7b401271187368087737d8f76cd2bba0b445a4,1d84ead9ee34bd339e0bde7ff472a8c3ee666702..bd250718fbb5f0f59756a48c16be76d7910d3272
--- 1/hw/i386/pc_q35.c
--- 2/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);
 -    pc_q35_init_1_5(args);
+     x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
 +    has_pci_info = false;
 +    pc_q35_init(args);
  }
  
  static QEMUMachine pc_q35_machine_v1_6 = {