From patchwork Wed Aug 15 16:13:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 177732 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 7118A2C0089 for ; Thu, 16 Aug 2012 02:45:31 +1000 (EST) Received: from localhost ([::1]:59805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gFm-0007Mx-UJ for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 12:15:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gFb-0007FE-Ih for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1gFa-0004LD-6e for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gFZ-0004L7-VQ for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:15:18 -0400 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 q7FGEJYp011519 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 15 Aug 2012 12:14:19 -0400 Received: from thinkpad.com (vpn-238-39.phx2.redhat.com [10.3.238.39]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7FGDtHt029187; Wed, 15 Aug 2012 12:14:15 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2012 18:13:25 +0200 Message-Id: <1345047221-26898-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1345047221-26898-1-git-send-email-imammedo@redhat.com> References: <1345047221-26898-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: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, gleb@redhat.com, vijaymohan.pandarathil@hp.com, jan.kiszka@siemens.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, akong@redhat.com, lersek@redhat.com, afaerber@suse.de, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH 05/21] target-i386: move out CPU features initialization in separate func 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 later it could be used in cpu_x86_find_by_name() to init CPU from found cpu_def Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- target-i386/cpu.c | 62 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index cc6ce48..f31462a 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -859,6 +859,39 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, cpu->env.tsc_khz = value / 1000; } +static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) +{ + CPUX86State *env = &cpu->env; + + if (def->vendor1) { + env->cpuid_vendor1 = def->vendor1; + env->cpuid_vendor2 = def->vendor2; + env->cpuid_vendor3 = def->vendor3; + } else { + env->cpuid_vendor1 = CPUID_VENDOR_INTEL_1; + env->cpuid_vendor2 = CPUID_VENDOR_INTEL_2; + env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3; + } + env->cpuid_vendor_override = def->vendor_override; + object_property_set_int(OBJECT(cpu), def->level, "level", errp); + object_property_set_int(OBJECT(cpu), def->family, "family", errp); + object_property_set_int(OBJECT(cpu), def->model, "model", errp); + object_property_set_int(OBJECT(cpu), def->stepping, "stepping", errp); + object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", errp); + object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp); + object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000, + "tsc-frequency", errp); + env->cpuid_features = def->features; + env->cpuid_ext_features = def->ext_features; + env->cpuid_ext2_features = def->ext2_features; + env->cpuid_ext3_features = def->ext3_features; + env->cpuid_kvm_features = def->kvm_features; + env->cpuid_svm_features = def->svm_features; + env->cpuid_ext4_features = def->ext4_features; + env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features; + env->cpuid_xlevel2 = def->xlevel2; +} + static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, const char *cpu_model, Error **errp) { @@ -1158,7 +1191,6 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) int cpu_x86_register(X86CPU *cpu, const char *cpu_model) { - CPUX86State *env = &cpu->env; x86_def_t def1, *def = &def1; Error *error = NULL; @@ -1168,33 +1200,7 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) goto out; } - if (def->vendor1) { - env->cpuid_vendor1 = def->vendor1; - env->cpuid_vendor2 = def->vendor2; - env->cpuid_vendor3 = def->vendor3; - } else { - env->cpuid_vendor1 = CPUID_VENDOR_INTEL_1; - env->cpuid_vendor2 = CPUID_VENDOR_INTEL_2; - env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3; - } - env->cpuid_vendor_override = def->vendor_override; - object_property_set_int(OBJECT(cpu), def->level, "level", &error); - object_property_set_int(OBJECT(cpu), def->family, "family", &error); - object_property_set_int(OBJECT(cpu), def->model, "model", &error); - object_property_set_int(OBJECT(cpu), def->stepping, "stepping", &error); - env->cpuid_features = def->features; - env->cpuid_ext_features = def->ext_features; - env->cpuid_ext2_features = def->ext2_features; - env->cpuid_ext3_features = def->ext3_features; - object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", &error); - env->cpuid_kvm_features = def->kvm_features; - env->cpuid_svm_features = def->svm_features; - env->cpuid_ext4_features = def->ext4_features; - env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features; - env->cpuid_xlevel2 = def->xlevel2; - object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000, - "tsc-frequency", &error); - object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); + cpudef_2_x86_cpu(cpu, def, &error); out: if (error_is_set(&error)) {