* additionally convert check_cpuid & enforce_cpuid to bool and make them members of CPUX86State * make 'enforce' feature independent from 'check'
Signed-off-by: Igor Mammedov <imamm...@redhat.com> --- target-i386/cpu.c | 13 ++++++------- target-i386/cpu.h | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index bf56677..366e3dd 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -233,9 +233,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) | @@ -1563,6 +1560,8 @@ static Property cpu_x86_properties[] = { DEFINE_PROP_HV_SPINLOCKS("hv-spinlocks", HYPERV_SPINLOCK_NEVER_RETRY), DEFINE_PROP_BOOL("hv-relaxed", X86CPU, env.hyperv_relaxed_timing, false), DEFINE_PROP_BOOL("hv-vapic", X86CPU, env.hyperv_vapic, false), + DEFINE_PROP_BOOL("check", X86CPU, env.check_cpuid, false), + DEFINE_PROP_BOOL("enforce", X86CPU, env.enforce_cpuid, false), DEFINE_PROP_END_OF_LIST(), }; @@ -1698,9 +1697,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")) { @@ -2469,8 +2468,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 ((env->check_cpuid || env->enforce_cpuid) + && kvm_check_features_against_host(cpu) && env->enforce_cpuid) { error_setg(&local_err, "Host's CPU doesn't support requested features"); goto out; diff --git a/target-i386/cpu.h b/target-i386/cpu.h index ea9143f..4ca7c11 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -852,6 +852,8 @@ typedef struct CPUX86State { bool hyperv_vapic; bool hyperv_relaxed_timing; int hyperv_spinlock_attempts; + bool check_cpuid; + bool enforce_cpuid; /* MTRRs */ uint64_t mtrr_fixed[11]; -- 1.7.1