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>
This commit is contained in:
Eduardo Habkost 2012-10-04 17:49:07 -03:00 committed by Marcelo Tosatti
parent b8091f245d
commit ffa8c11f0b

View file

@ -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 &=