From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtU6W-00054M-I6 for qemu-devel@nongnu.org; Thu, 10 Jan 2013 21:12:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtU6U-0000Vw-EZ for qemu-devel@nongnu.org; Thu, 10 Jan 2013 21:12:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtU6U-0000Vo-77 for qemu-devel@nongnu.org; Thu, 10 Jan 2013 21:12:18 -0500 From: Igor Mammedov Date: Fri, 11 Jan 2013 03:10:18 +0100 Message-Id: <1357870231-26762-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1357870231-26762-1-git-send-email-imammedo@redhat.com> References: <1357870231-26762-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 04/17] target-i386: add x86_cpu_vendor_words2str() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, afaerber@suse.de Make for() cycle reusable for the next patch Signed-off-by: Igor Mammedov --- v4: - rename x86cpu_vendor_words2str() to x86_cpu_vendor_words2str() Suggested-By: Andreas F=C3=A4rber v3: -replace e[bcd]x arguments naming with vendor[123] -fix/swap vendor2 and vendor3 order Spotted-By: Eduardo Habkost v2: -place x86cpu_vendor_words2str() a bit earlier, before feature arrays to avoid compile error when vendor property is converted static property. --- target-i386/cpu.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c4ff761..64cc88f 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -45,6 +45,18 @@ #include "hw/apic_internal.h" #endif =20 +static void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1, + uint32_t vendor2, uint32_t vendor3) +{ + int i; + for (i =3D 0; i < 4; i++) { + dst[i] =3D vendor1 >> (8 * i); + dst[i + 4] =3D vendor2 >> (8 * i); + dst[i + 8] =3D vendor3 >> (8 * i); + } + dst[CPUID_VENDOR_SZ] =3D '\0'; +} + /* feature flags taken from "Intel Processor Identification and the CPUI= D * Instruction" and AMD's "CPUID Specification". In cases of disagreeme= nt * between feature naming conventions, aliases may be added. @@ -1213,15 +1225,10 @@ static char *x86_cpuid_get_vendor(Object *obj, Er= ror **errp) X86CPU *cpu =3D X86_CPU(obj); CPUX86State *env =3D &cpu->env; char *value; - int i; =20 value =3D (char *)g_malloc(CPUID_VENDOR_SZ + 1); - for (i =3D 0; i < 4; i++) { - value[i ] =3D env->cpuid_vendor1 >> (8 * i); - value[i + 4] =3D env->cpuid_vendor2 >> (8 * i); - value[i + 8] =3D env->cpuid_vendor3 >> (8 * i); - } - value[CPUID_VENDOR_SZ] =3D '\0'; + x86_cpu_vendor_words2str(value, env->cpuid_vendor1, env->cpuid_vendo= r2, + env->cpuid_vendor3); return value; } =20 --=20 1.7.1