From patchwork Thu Dec 20 00:16:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 207579 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 830F32C0097 for ; Thu, 20 Dec 2012 11:16:31 +1100 (EST) Received: from localhost ([::1]:34067 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlToK-0003XE-SI for incoming@patchwork.ozlabs.org; Wed, 19 Dec 2012 19:16:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlToC-0003Tz-Ga for qemu-devel@nongnu.org; Wed, 19 Dec 2012 19:16:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlToB-0003yV-Dz for qemu-devel@nongnu.org; Wed, 19 Dec 2012 19:16:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14148) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlToB-0003yQ-6S for qemu-devel@nongnu.org; Wed, 19 Dec 2012 19:16:19 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBK0GIBV003458 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 19 Dec 2012 19:16:18 -0500 Received: from thinkpad.com (vpn-233-151.phx2.redhat.com [10.3.233.151]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qBK0GGNx025690; Wed, 19 Dec 2012 19:16:17 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 20 Dec 2012 01:16:13 +0100 Message-Id: <1355962573-6394-1-git-send-email-imammedo@redhat.com> In-Reply-To: <1355961767-3854-1-git-send-email-imammedo@redhat.com> References: <1355961767-3854-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: afaerber@suse.de, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH 11/20] target-i386: add x86cpu_vendor_words2str() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make for() cycle reusable for the next patch Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- target-i386/cpu.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a74d74b..06b991e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -847,6 +847,18 @@ static x86_def_t builtin_x86_defs[] = { }, }; +static void x86cpu_vendor_words2str(char *dst, uint32_t ebx, uint32_t ecx, + uint32_t edx) +{ + int i; + for (i = 0; i < 4; i++) { + dst[i] = ebx >> (8 * i); + dst[i + 4] = edx >> (8 * i); + dst[i + 8] = ecx >> (8 * i); + } + dst[CPUID_VENDOR_SZ] = '\0'; +} + #ifdef CONFIG_KVM static int cpu_x86_fill_model_id(char *str) { @@ -1130,15 +1142,10 @@ static char *x86_cpuid_get_vendor(Object *obj, Error **errp) X86CPU *cpu = X86_CPU(obj); CPUX86State *env = &cpu->env; char *value; - int i; 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[CPUID_VENDOR_SZ] = '\0'; + x86cpu_vendor_words2str(value, env->cpuid_vendor1, env->cpuid_vendor2, + env->cpuid_vendor3); return value; }