On Tue, Dec 04, 2012 at 05:34:40PM -0200, Eduardo Habkost wrote:
> From: Igor Mammedov <imamm...@redhat.com>
>
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> target-i386/cpu.c | 6 +++---
> target-i386/cpu.h | 2 ++
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 70ba323..05ac79a 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -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;
> diff --git a/target-i386/cpu.h b/target-i386/cpu.h
> index 90ef1ff..386c4f6 100644
> --- a/target-i386/cpu.h
> +++ b/target-i386/cpu.h
> @@ -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" */
> --
> 1.7.11.7
>
>
--
Eduardo
