From: Peter Maydell Date: Tue, 4 Nov 2014 15:54:27 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging X-Git-Tag: v2.2.0-rc0~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bb41e5d307a819789f3bab719419ac7b77e6f80;p=thirdparty%2Fqemu.git 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 --- 2bb41e5d307a819789f3bab719419ac7b77e6f80 diff --cc hw/i386/pc_piix.c index 537bcf28daf,93778cdc8f8..b559181ba7d --- a/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 296bdecc80e,ec400e16df9..598e679749c --- a/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)