Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
commit2bb41e5d307a819789f3bab719419ac7b77e6f80
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 4 Nov 2014 15:54:27 +0000 (4 15:54 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 4 Nov 2014 15:56:26 +0000 (4 15:56 +0000)
tree8be67308ba4327b3e61e48aa3e6db9f6dd21fb41
parent1bc8dae31baa8b02a1b8e70c3244232e03bbb3b2
parent75d373ef9729bd22fbc46bfd8dcd158cbf6d9777
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging

QOM CPUState and X86CPU

* Cleanups for -cpu ...,enforce

* remotes/afaerber/tags/qom-cpu-for-peter:
  target-i386: Disable SVM by default in KVM mode
  target-i386: Don't enable nested VMX by default
  target-i386: Remove unsupported bits from all CPU models
  target-i386: Disable CPUID_ACPI by default in KVM mode
  target-i386: Rename KVM auto-feature-enable compat function
  pc: Create pc_compat_2_1() functions

Conflicts:
hw/i386/pc_piix.c
hw/i386/pc_q35.c
[PMM: Fixed minor textual conflicts]

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/i386/pc_piix.c
hw/i386/pc_q35.c