diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-04-17 15:17:27 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-04-25 10:51:35 +0200 |
| commit | 938d4c2521149a13fc4dc77e68e31953d2ec5e66 (patch) | |
| tree | d5d33c7460b8598d0ce974edeeea6da3519d7874 /target-i386 | |
| parent | 036e2222ca70f80515c6b780a30068cd0be8b7b4 (diff) | |
| download | qemu-938d4c2521149a13fc4dc77e68e31953d2ec5e66.zip qemu-938d4c2521149a13fc4dc77e68e31953d2ec5e66.tar.gz qemu-938d4c2521149a13fc4dc77e68e31953d2ec5e66.tar.bz2 | |
target-i386: Add "model-id" property to X86CPU
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 82194dd..bb57345 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -673,8 +673,11 @@ static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v, 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(Object *obj, const char *model_id, + Error **errp) { + X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; int c, len, i; if (model_id == NULL) { @@ -1004,7 +1007,7 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) env->cpuid_ext3_features &= TCG_EXT3_FEATURES; env->cpuid_svm_features &= TCG_SVM_FEATURES; } - x86_cpuid_set_model_id(env, def->model_id); + object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); if (error_is_set(&error)) { error_free(error); return -1; @@ -1543,6 +1546,9 @@ static void x86_cpu_initfn(Object *obj) object_property_add(obj, "stepping", "int", NULL, x86_cpuid_version_set_stepping, NULL, NULL, NULL); + object_property_add_str(obj, "model-id", + NULL, + x86_cpuid_set_model_id, NULL); env->cpuid_apic_id = env->cpu_index; mce_init(cpu); |