target-i386: x86_cpu_load_features() function
When probing for CPU model information, we need to reuse the code that initializes CPUID fields, but not the remaining side-effects of x86_cpu_realizefn(). Move that code to a separate function that can be reused later. Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
e9e60febc4
commit
41f3d4d69a
|
@ -3000,34 +3000,13 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu)
|
||||||
env->features[FEAT_XSAVE_COMP_HI] = mask >> 32;
|
env->features[FEAT_XSAVE_COMP_HI] = mask >> 32;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define IS_INTEL_CPU(env) ((env)->cpuid_vendor1 == CPUID_VENDOR_INTEL_1 && \
|
/* Load CPUID data based on configured features */
|
||||||
(env)->cpuid_vendor2 == CPUID_VENDOR_INTEL_2 && \
|
static void x86_cpu_load_features(X86CPU *cpu, Error **errp)
|
||||||
(env)->cpuid_vendor3 == CPUID_VENDOR_INTEL_3)
|
|
||||||
#define IS_AMD_CPU(env) ((env)->cpuid_vendor1 == CPUID_VENDOR_AMD_1 && \
|
|
||||||
(env)->cpuid_vendor2 == CPUID_VENDOR_AMD_2 && \
|
|
||||||
(env)->cpuid_vendor3 == CPUID_VENDOR_AMD_3)
|
|
||||||
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
||||||
{
|
{
|
||||||
CPUState *cs = CPU(dev);
|
|
||||||
X86CPU *cpu = X86_CPU(dev);
|
|
||||||
X86CPUClass *xcc = X86_CPU_GET_CLASS(dev);
|
|
||||||
CPUX86State *env = &cpu->env;
|
CPUX86State *env = &cpu->env;
|
||||||
Error *local_err = NULL;
|
|
||||||
static bool ht_warned;
|
|
||||||
FeatureWord w;
|
FeatureWord w;
|
||||||
GList *l;
|
GList *l;
|
||||||
|
Error *local_err = NULL;
|
||||||
if (xcc->kvm_required && !kvm_enabled()) {
|
|
||||||
char *name = x86_cpu_class_get_model_name(xcc);
|
|
||||||
error_setg(&local_err, "CPU model '%s' requires KVM", name);
|
|
||||||
g_free(name);
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cpu->apic_id == UNASSIGNED_APIC_ID) {
|
|
||||||
error_setg(errp, "apic-id property was not initialized properly");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*TODO: cpu->host_features incorrectly overwrites features
|
/*TODO: cpu->host_features incorrectly overwrites features
|
||||||
* set using "feat=on|off". Once we fix this, we can convert
|
* set using "feat=on|off". Once we fix this, we can convert
|
||||||
|
@ -3093,6 +3072,44 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
env->cpuid_xlevel2 = env->cpuid_min_xlevel2;
|
env->cpuid_xlevel2 = env->cpuid_min_xlevel2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
|
if (local_err != NULL) {
|
||||||
|
error_propagate(errp, local_err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#define IS_INTEL_CPU(env) ((env)->cpuid_vendor1 == CPUID_VENDOR_INTEL_1 && \
|
||||||
|
(env)->cpuid_vendor2 == CPUID_VENDOR_INTEL_2 && \
|
||||||
|
(env)->cpuid_vendor3 == CPUID_VENDOR_INTEL_3)
|
||||||
|
#define IS_AMD_CPU(env) ((env)->cpuid_vendor1 == CPUID_VENDOR_AMD_1 && \
|
||||||
|
(env)->cpuid_vendor2 == CPUID_VENDOR_AMD_2 && \
|
||||||
|
(env)->cpuid_vendor3 == CPUID_VENDOR_AMD_3)
|
||||||
|
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
CPUState *cs = CPU(dev);
|
||||||
|
X86CPU *cpu = X86_CPU(dev);
|
||||||
|
X86CPUClass *xcc = X86_CPU_GET_CLASS(dev);
|
||||||
|
CPUX86State *env = &cpu->env;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
static bool ht_warned;
|
||||||
|
|
||||||
|
if (xcc->kvm_required && !kvm_enabled()) {
|
||||||
|
char *name = x86_cpu_class_get_model_name(xcc);
|
||||||
|
error_setg(&local_err, "CPU model '%s' requires KVM", name);
|
||||||
|
g_free(name);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cpu->apic_id == UNASSIGNED_APIC_ID) {
|
||||||
|
error_setg(errp, "apic-id property was not initialized properly");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
x86_cpu_load_features(cpu, &local_err);
|
||||||
|
if (local_err) {
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
if (x86_cpu_filter_features(cpu) &&
|
if (x86_cpu_filter_features(cpu) &&
|
||||||
(cpu->check_cpuid || cpu->enforce_cpuid)) {
|
(cpu->check_cpuid || cpu->enforce_cpuid)) {
|
||||||
x86_cpu_report_filtered_features(cpu);
|
x86_cpu_report_filtered_features(cpu);
|
||||||
|
|
Loading…
Reference in a new issue