Skip to content

Commit

Permalink
target-i386: Disable CPUID_ACPI by default in KVM mode
Browse files Browse the repository at this point in the history
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 136a7e9).

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>
  • Loading branch information
ehabkost authored and afaerber committed Nov 4, 2014
1 parent 1cadaa9 commit 864867b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions target-i386/cpu.c
Expand Up @@ -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,
};

Expand Down

0 comments on commit 864867b

Please sign in to comment.