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>

diff --cc hw/i386/pc_piix.c
index 537bcf28dafc84dc5403b63b772d477bb895db13,93778cdc8f80163a017fd8c37678ec43040692e5..b559181ba7d567ba3d7ead3a76a853d76bc3cafc
--- 1/hw/i386/pc_piix.c
--- 2/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@@ -305,7 -304,9 +305,10 @@@ static void pc_init_pci(MachineState *m
  
  static void pc_compat_2_1(MachineState *machine)
  {
 +    smbios_uuid_encoded = false;
+     x86_cpu_compat_set_features("coreduo", FEAT_1_ECX, CPUID_EXT_VMX, 0);
+     x86_cpu_compat_set_features("core2duo", FEAT_1_ECX, CPUID_EXT_VMX, 0);
+     x86_cpu_compat_kvm_no_autodisable(FEAT_8000_0001_ECX, CPUID_EXT3_SVM);
  }
  
  static void pc_compat_2_0(MachineState *machine)

diff --cc hw/i386/pc_q35.c
index 296bdecc80ea0fc6ac11c7789da0e7b79092761f,ec400e16df9c2ad6c11b17a96969bbf440be7f6c..598e679749c78f8f678e7c831c9e57f2b31ec0ee
--- 1/hw/i386/pc_q35.c
--- 2/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@@ -284,7 -283,9 +284,10 @@@ static void pc_q35_init(MachineState *m
  
  static void pc_compat_2_1(MachineState *machine)
  {
 +    smbios_uuid_encoded = false;
+     x86_cpu_compat_set_features("coreduo", FEAT_1_ECX, CPUID_EXT_VMX, 0);
+     x86_cpu_compat_set_features("core2duo", FEAT_1_ECX, CPUID_EXT_VMX, 0);
+     x86_cpu_compat_kvm_no_autodisable(FEAT_8000_0001_ECX, CPUID_EXT3_SVM);
  }
  
  static void pc_compat_2_0(MachineState *machine)