From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJI-0005kY-U5 for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGyJE-0004Ns-Pj for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54343) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJE-0004Nk-HI for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:16 -0400 From: Igor Mammedov Date: Wed, 26 Sep 2012 22:32:52 +0200 Message-Id: <1348691578-17231-17-git-send-email-imammedo@redhat.com> In-Reply-To: <1348691578-17231-1-git-send-email-imammedo@redhat.com> References: <1348691578-17231-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 16/22] target-i386: use define for cpuid vendor string size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, stefanha@linux.vnet.ibm.com Signed-off-by: Igor Mammedov --- 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 4f333e9..5c7c5a5 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1102,13 +1102,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; } @@ -1119,7 +1119,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 4f525ee..b6bcdf1 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -474,6 +474,8 @@ #define CPUID_SVM_PAUSEFILTER (1 << 10) #define CPUID_SVM_PFTHRESHOLD (1 << 12) +#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.1