[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] target-i386: Convert 'check' and 'enforce' to
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 08/10] target-i386: Convert 'check' and 'enforce' to static properties |
Date: |
Tue, 24 Dec 2013 13:58:59 +0100 |
From: Igor Mammedov <address@hidden>
* Additionally convert check_cpuid & enforce_cpuid to bool and make them
members of X86CPU
* Make 'enforce' feature independent from 'check'
Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu-qom.h | 2 ++
target-i386/cpu.c | 13 ++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index dbe3e29..d1751a4 100644
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -69,6 +69,8 @@ typedef struct X86CPU {
bool hyperv_vapic;
bool hyperv_relaxed_timing;
int hyperv_spinlock_attempts;
+ bool check_cpuid;
+ bool enforce_cpuid;
/* if true the CPUID code directly forward host cache leaves to the guest
*/
bool cache_info_passthrough;
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 39c57f8..6055035 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -354,9 +354,6 @@ typedef struct model_features_t {
FeatureWord feat_word;
} model_features_t;
-int check_cpuid = 0;
-int enforce_cpuid = 0;
-
static uint32_t kvm_default_features = (1 << KVM_FEATURE_CLOCKSOURCE) |
(1 << KVM_FEATURE_NOP_IO_DELAY) |
(1 << KVM_FEATURE_CLOCKSOURCE2) |
@@ -1772,9 +1769,9 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char
*features, Error **errp)
goto out;
}
} else if (!strcmp(featurestr, "check")) {
- check_cpuid = 1;
+ object_property_parse(OBJECT(cpu), "on", featurestr, errp);
} else if (!strcmp(featurestr, "enforce")) {
- check_cpuid = enforce_cpuid = 1;
+ object_property_parse(OBJECT(cpu), "on", featurestr, errp);
} else if (!strcmp(featurestr, "hv_relaxed")) {
object_property_parse(OBJECT(cpu), "on", "hv-relaxed", errp);
} else if (!strcmp(featurestr, "hv_vapic")) {
@@ -2608,8 +2605,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES;
env->features[FEAT_SVM] &= TCG_SVM_FEATURES;
} else {
- if (check_cpuid && kvm_check_features_against_host(cpu)
- && enforce_cpuid) {
+ if ((cpu->check_cpuid || cpu->enforce_cpuid)
+ && kvm_check_features_against_host(cpu) && cpu->enforce_cpuid) {
error_setg(&local_err,
"Host's CPU doesn't support requested features");
goto out;
@@ -2771,6 +2768,8 @@ static Property x86_cpu_properties[] = {
{ .name = "hv-spinlocks", .info = &qdev_prop_spinlocks },
DEFINE_PROP_BOOL("hv-relaxed", X86CPU, hyperv_relaxed_timing, false),
DEFINE_PROP_BOOL("hv-vapic", X86CPU, hyperv_vapic, false),
+ DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, false),
+ DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false),
DEFINE_PROP_END_OF_LIST()
};
--
1.8.4
- [Qemu-devel] [PULL 00/10] QOM CPUState patch queue 2013-12-24, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 02/10] cputlb: Tidy memset() of arrays, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 01/10] cputlb: Use memset() when flushing entries, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 04/10] cpu-exec: Optimize X86CPU usage in cpu_exec(), Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 03/10] target-i386: Move apic_state field from CPUX86State to X86CPU, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 07/10] target-i386: Convert 'hv_spinlocks' to static property, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 09/10] target-i386: Cleanup 'foo' feature handling, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 06/10] target-i386: Convert 'hv_vapic' to static property, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 10/10] target-i386: Cleanup 'foo=val' feature handling, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 05/10] target-i386: Convert 'hv_relaxed' to static property, Andreas Färber, 2013/12/24
- [Qemu-devel] [PULL 08/10] target-i386: Convert 'check' and 'enforce' to static properties,
Andreas Färber <=