From 46f9071a23385933e7318a7c1f540852689ee0ca Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 2 Apr 2013 17:48:12 -0300 Subject: [PATCH] target-i386: Check for host features before filter_features_for_kvm() commit 5ec01c2e96910e1588d1a0de8609b9dda7618c7f broke "-cpu ..,enforce", as it has moved kvm_check_features_against_host() after the filter_features_for_kvm() call. filter_features_for_kvm() removes all features not supported by the host, so this effectively made kvm_check_features_against_host() impossible to fail. This patch changes the call so we check for host feature support before filtering the feature bits. Signed-off-by: Eduardo Habkost Message-id: 1364935692-24004-1-git-send-email-ehabkost@redhat.com Cc: Igor Mammedov Signed-off-by: Anthony Liguori (cherry picked from commit a509d632c877f7b5fa07368879b8ae5919a6d345) Signed-off-by: Michael Roth --- target-i386/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index aab35c74d9..d9500e9fc9 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2091,14 +2091,14 @@ void x86_cpu_realize(Object *obj, Error **errp) env->cpuid_ext3_features &= TCG_EXT3_FEATURES; env->cpuid_svm_features &= TCG_SVM_FEATURES; } else { -#ifdef CONFIG_KVM - filter_features_for_kvm(cpu); -#endif if (check_cpuid && kvm_check_features_against_host(cpu) && enforce_cpuid) { error_setg(errp, "Host's CPU doesn't support requested features"); return; } +#ifdef CONFIG_KVM + filter_features_for_kvm(cpu); +#endif } #ifndef CONFIG_USER_ONLY -- GitLab