From: Andreas Färber <afaerber@suse.de>
Date: Tue, 17 Apr 2012 16:21:52 +0000 (+0200)
Subject: target-i386: Fix x86_cpuid_set_model_id()
X-Git-Tag: qemu-xen-4.3.0-rc1~1168^2~14
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d0a6acf456a2497ce9f70f8366a5b405745ba279;p=qemu-upstream-4.6-testing.git

target-i386: Fix x86_cpuid_set_model_id()

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>
---

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 3df53ca74..e1517e65c 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -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';