]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
target-i386: Fix x86_cpuid_set_model_id()
authorAndreas Färber <afaerber@suse.de>
Tue, 17 Apr 2012 16:21:52 +0000 (18:21 +0200)
committerAndreas Färber <afaerber@suse.de>
Wed, 25 Apr 2012 08:45:46 +0000 (10:45 +0200)
Don't assume zeroed cpuid_model[] fields.

This didn't break anything yet but QOM properties should be able to set
the value to something else without setting an intermediate zero string.

Reviewed-by: Eduardo Habhost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
[AF: Use memset() instead of for loop, suggested by Igor]
Signed-off-by: Andreas Färber <afaerber@suse.de>
target-i386/cpu.c

index 3df53ca74b2f32b02ab9025f67c06b359495ad6a..e1517e65c6014fe8dbb29200c49c0a53c1f6947c 100644 (file)
@@ -627,6 +627,7 @@ static void x86_cpuid_set_model_id(CPUX86State *env, const char *model_id)
         model_id = "";
     }
     len = strlen(model_id);
+    memset(env->cpuid_model, 0, 48);
     for (i = 0; i < 48; i++) {
         if (i >= len) {
             c = '\0';