From: Eduardo Habkost Date: Thu, 4 Oct 2012 20:49:07 +0000 (-0300) Subject: i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~3119^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffa8c11f0bbf47e1b7a3a62f97bc1da591c6734a;p=sdk%2Femulator%2Fqemu.git 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 Signed-off-by: Marcelo Tosatti --- diff --git a/target-i386/cpu.c b/target-i386/cpu.c index be16898..22d91ed 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 &=