aboutsummaryrefslogtreecommitdiff
path: root/target-i386/cpu.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2012-10-04 17:49:07 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2012-10-30 23:39:49 -0200
commitffa8c11f0bbf47e1b7a3a62f97bc1da591c6734a (patch)
tree8d7bf7f0860bdf69af5d6c63cf1ba7b00c2cca42 /target-i386/cpu.c
parentb8091f245d36da604219db42552cc28400698446 (diff)
i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too
Now that CPUID leaf 7 features can be enabled/disabled on the command-line, we need to filter them properly using GET_SUPPORTED_CPUID, at the same place where other features are filtered out. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-i386/cpu.c')
-rw-r--r--target-i386/cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index be16898e37..22d91ed074 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1384,6 +1384,8 @@ static void filter_features_for_kvm(X86CPU *cpu)
kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_ECX);
env->cpuid_svm_features &=
kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX);
+ env->cpuid_7_0_ebx_features &=
+ kvm_arch_get_supported_cpuid(s, 7, 0, R_EBX);
env->cpuid_kvm_features &=
kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX);
env->cpuid_ext4_features &=