[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] target-i386: Call kvm_check_features_against_ho
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 8/9] target-i386: Call kvm_check_features_against_host() only if CONFIG_KVM is set |
Date: |
Fri, 4 Jan 2013 13:37:43 -0200 |
This will be necessary once kvm_check_features_against_host() starts
using KVM-specific definitions (so it won't compile anymore if
CONFIG_KVM is not set).
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 05134a8..02c00bf 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -933,6 +933,7 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
#endif /* CONFIG_KVM */
}
+#ifdef CONFIG_KVM
static int unavailable_host_feature(struct model_features_t *f, uint32_t mask)
{
int i;
@@ -981,6 +982,7 @@ static int kvm_check_features_against_host(x86_def_t
*guest_def)
}
return rv;
}
+#endif
static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
@@ -1404,10 +1406,12 @@ static int cpu_x86_parse_featurestr(x86_def_t
*x86_cpu_def, char *features)
x86_cpu_def->kvm_features &= ~minus_kvm_features;
x86_cpu_def->svm_features &= ~minus_svm_features;
x86_cpu_def->cpuid_7_0_ebx_features &= ~minus_7_0_ebx_features;
+#ifdef CONFIG_KVM
if (check_cpuid && kvm_enabled()) {
if (kvm_check_features_against_host(x86_cpu_def) && enforce_cpuid)
goto error;
}
+#endif
return 0;
error:
--
1.7.11.7
- [Qemu-devel] [PATCH 0/9] target-i386: make "enforce" flag work as it should, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [PATCH 2/9] target-i386: kvm: Enable all supported KVM features for -cpu host, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [PATCH 4/9] target-i386: check/enforce: Do not ignore "hypervisor" flag, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [PATCH 5/9] target-i386: check/enforce: Check all CPUID.80000001H.EDX bits, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [PATCH 8/9] target-i386: Call kvm_check_features_against_host() only if CONFIG_KVM is set,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 6/9] target-i386: check/enforce: Check SVM flag support as well, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [PATCH 7/9] target-i386: check/enforce: Eliminate check_feat field, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [PATCH 9/9] target-i386: check/enforce: Check all feature words, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [PATCH 1/9] target-i386: kvm: -cpu host: Use GET_SUPPORTED_CPUID for SVM features, Eduardo Habkost, 2013/01/04
- [Qemu-devel] [PATCH 3/9] target-i386: check/enforce: Fix CPUID leaf numbers on error messages, Eduardo Habkost, 2013/01/04
- Message not available
- Re: [Qemu-devel] [PATCH 0/9] target-i386: make "enforce" flag work as it should, Anthony Liguori, 2013/01/04