Commit 9df694ee authored by Igor Mammedov's avatar Igor Mammedov Committed by Andreas Färber
Browse files

target-i386: Use define for cpuid vendor string size 



Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 8f961357

target-i386/cpu.c

+3 −3
Original line number Diff line number Diff line
@@ -1106,13 +1106,13 @@ static char *x86_cpuid_get_vendor(Object *obj, Error **errp) 
    char *value;

    int i;



    value = (char *)g_malloc(12 + 1);

    value = (char *)g_malloc(CPUID_VENDOR_SZ + 1);

    for (i = 0; i < 4; i++) {

        value[i    ] = env->cpuid_vendor1 >> (8 * i);

        value[i + 4] = env->cpuid_vendor2 >> (8 * i);

        value[i + 8] = env->cpuid_vendor3 >> (8 * i);

    }

    value[12] = '\0';

    value[CPUID_VENDOR_SZ] = '\0';

    return value;

}
@@ -1123,7 +1123,7 @@ static void x86_cpuid_set_vendor(Object *obj, const char *value, 
    CPUX86State *env = &cpu->env;

    int i;



    if (strlen(value) != 12) {

    if (strlen(value) != CPUID_VENDOR_SZ) {

        error_set(errp, QERR_PROPERTY_VALUE_BAD, "",

                  "vendor", value);

        return;

target-i386/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -510,6 +510,8 @@ 
#define CPUID_7_0_EBX_ADX      (1 << 19)

#define CPUID_7_0_EBX_SMAP     (1 << 20)



#define CPUID_VENDOR_SZ      12



#define CPUID_VENDOR_INTEL_1 0x756e6547 /* "Genu" */

#define CPUID_VENDOR_INTEL_2 0x49656e69 /* "ineI" */

#define CPUID_VENDOR_INTEL_3 0x6c65746e /* "ntel" */