From: Andreas Färber <afaerber@suse.de>
Date: Tue, 17 Apr 2012 21:02:26 +0000 (+0200)
Subject: target-i386: Add property getter for CPU model-id
X-Git-Tag: v1.1-rc0~36^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63e886ebef04c3c8b40735a1467a11caf3efda4a;p=thirdparty%2Fqemu.git

target-i386: Add property getter for CPU model-id

Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 2ff51429508..8b5c47d7a02 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -711,6 +711,21 @@ static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v,
     env->cpuid_version |= value & 0xf;
 }
 
+static char *x86_cpuid_get_model_id(Object *obj, Error **errp)
+{
+    X86CPU *cpu = X86_CPU(obj);
+    CPUX86State *env = &cpu->env;
+    char *value;
+    int i;
+
+    value = g_malloc(48 + 1);
+    for (i = 0; i < 48; i++) {
+        value[i] = env->cpuid_model[i >> 2] >> (8 * (i & 3));
+    }
+    value[48] = '\0';
+    return value;
+}
+
 static void x86_cpuid_set_model_id(Object *obj, const char *model_id,
                                    Error **errp)
 {
@@ -1585,7 +1600,7 @@ static void x86_cpu_initfn(Object *obj)
                         x86_cpuid_version_get_stepping,
                         x86_cpuid_version_set_stepping, NULL, NULL, NULL);
     object_property_add_str(obj, "model-id",
-                            NULL,
+                            x86_cpuid_get_model_id,
                             x86_cpuid_set_model_id, NULL);
 
     env->cpuid_apic_id = env->cpu_index;