diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-10-03 16:39:48 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-11-04 15:35:47 +0100 |
| commit | 864867b91b48d38e2bfc7b225197901e6f7d8216 (patch) | |
| tree | 0a50bc8d7cc9863b214849b72466682a96d6ae55 /target-i386 | |
| parent | 1cadaa9482244f7d6477afc34c04a5dad84afdde (diff) | |
| download | qemu-864867b91b48d38e2bfc7b225197901e6f7d8216.zip qemu-864867b91b48d38e2bfc7b225197901e6f7d8216.tar.gz qemu-864867b91b48d38e2bfc7b225197901e6f7d8216.tar.bz2 | |
target-i386: Disable CPUID_ACPI by default in KVM mode
KVM never supported the CPUID_ACPI flag, so it doesn't make sense to
have it enabled by default when KVM is enabled.
The motivation here is exactly the same we had for the MONITOR flag
(disabled by commit 136a7e9a85d7047461f8153f7d12c514a3d68f69).
And like in the MONITOR flag case, we don't need machine-type compat code
because it is currently impossible to run a KVM VM with the ACPI flag set.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 1b25965..727416e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -459,6 +459,7 @@ static uint32_t kvm_default_features[FEATURE_WORDS] = { /* Features that are not added by default to any CPU model when KVM is enabled. */ static uint32_t kvm_default_unset_features[FEATURE_WORDS] = { + [FEAT_1_EDX] = CPUID_ACPI, [FEAT_1_ECX] = CPUID_EXT_MONITOR, }; |