Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
commit9d054ea543c2f94ddea5db29cc908899a188c07d
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 12 Aug 2013 20:03:20 +0000 (12 15:03 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 12 Aug 2013 20:03:20 +0000 (12 15:03 -0500)
treedcb57b99b07efb9a3869a721bb322842ced8ae8a
parent9fb7aaaf4c58c9108327f0ae4766087e3e496b47
parent56383703c060777fd01aaf8d63d5f46d660e9fb9
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>
hw/i386/pc_piix.c
hw/i386/pc_q35.c