Commit 036e2222 authored by Andreas Färber's avatar Andreas Färber
Browse files

target-i386: Add "stepping" property to X86CPU


Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
parent c5291a4f
...@@ -649,10 +649,28 @@ static void x86_cpuid_version_set_model(Object *obj, Visitor *v, void *opaque, ...@@ -649,10 +649,28 @@ static void x86_cpuid_version_set_model(Object *obj, Visitor *v, void *opaque,
env->cpuid_version |= ((value & 0xf) << 4) | ((value >> 4) << 16); env->cpuid_version |= ((value & 0xf) << 4) | ((value >> 4) << 16);
} }
static void x86_cpuid_version_set_stepping(CPUX86State *env, int stepping) static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v,
void *opaque, const char *name,
Error **errp)
{ {
X86CPU *cpu = X86_CPU(obj);
CPUX86State *env = &cpu->env;
const int64_t min = 0;
const int64_t max = 0xf;
int64_t value;
visit_type_int(v, &value, name, errp);
if (error_is_set(errp)) {
return;
}
if (value < min || value > max) {
error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
name ? name : "null", value, min, max);
return;
}
env->cpuid_version &= ~0xf; env->cpuid_version &= ~0xf;
env->cpuid_version |= stepping & 0xf; env->cpuid_version |= value & 0xf;
} }
static void x86_cpuid_set_model_id(CPUX86State *env, const char *model_id) static void x86_cpuid_set_model_id(CPUX86State *env, const char *model_id)
...@@ -964,7 +982,7 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) ...@@ -964,7 +982,7 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
env->cpuid_level = def->level; env->cpuid_level = def->level;
object_property_set_int(OBJECT(cpu), def->family, "family", &error); object_property_set_int(OBJECT(cpu), def->family, "family", &error);
object_property_set_int(OBJECT(cpu), def->model, "model", &error); object_property_set_int(OBJECT(cpu), def->model, "model", &error);
x86_cpuid_version_set_stepping(env, def->stepping); object_property_set_int(OBJECT(cpu), def->stepping, "stepping", &error);
env->cpuid_features = def->features; env->cpuid_features = def->features;
env->cpuid_ext_features = def->ext_features; env->cpuid_ext_features = def->ext_features;
env->cpuid_ext2_features = def->ext2_features; env->cpuid_ext2_features = def->ext2_features;
...@@ -1522,6 +1540,9 @@ static void x86_cpu_initfn(Object *obj) ...@@ -1522,6 +1540,9 @@ static void x86_cpu_initfn(Object *obj)
object_property_add(obj, "model", "int", object_property_add(obj, "model", "int",
NULL, NULL,
x86_cpuid_version_set_model, NULL, NULL, NULL); x86_cpuid_version_set_model, NULL, NULL, NULL);
object_property_add(obj, "stepping", "int",
NULL,
x86_cpuid_version_set_stepping, NULL, NULL, NULL);
env->cpuid_apic_id = env->cpu_index; env->cpuid_apic_id = env->cpu_index;
mce_init(cpu); mce_init(cpu);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment