From patchwork Fri Dec 28 20:01:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 208565 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 0043A2C0098 for ; Sat, 29 Dec 2012 07:14:26 +1100 (EST) Received: from localhost ([::1]:43138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tog9L-00061h-D7 for incoming@patchwork.ozlabs.org; Fri, 28 Dec 2012 15:03:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tog8c-0004tL-Gm for qemu-devel@nongnu.org; Fri, 28 Dec 2012 15:02:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tog8Y-0003Sb-9M for qemu-devel@nongnu.org; Fri, 28 Dec 2012 15:02:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tog8Y-0003SU-2V for qemu-devel@nongnu.org; Fri, 28 Dec 2012 15:02:34 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBSK2XFi030610 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 28 Dec 2012 15:02:33 -0500 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBSK2Owm012028; Fri, 28 Dec 2012 15:02:32 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 28 Dec 2012 21:01:21 +0100 Message-Id: <1356724895-24118-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1356724895-24118-1-git-send-email-imammedo@redhat.com> References: <1356724895-24118-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: ehabkost@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 06/20] 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 No functional change, a simple code movement to simplify following refactoring. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- v2: - rebased on top of "i386: cpu: remove duplicate feature names" http://www.mail-archive.com/qemu-devel@nongnu.org/msg129458.html v3: - rebased on top of 1.3 & split cpu_x86_find_by_name() - AMD's ext2_features filtering is moved into separate patch --- target-i386/cpu.c | 53 ++++++++++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 23 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e534254..3b9bbfe 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1235,6 +1235,34 @@ 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; + + assert(def->vendor1); + env->cpuid_vendor1 = def->vendor1; + env->cpuid_vendor2 = def->vendor2; + env->cpuid_vendor3 = def->vendor3; + 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); + 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", errp); + 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_features = 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", errp); + object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp); +} + static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name) { x86_def_t *def; @@ -1513,7 +1541,6 @@ static void filter_features_for_kvm(X86CPU *cpu) int cpu_x86_register(X86CPU *cpu, const char *cpu_model) { - CPUX86State *env = &cpu->env; x86_def_t def1, *def = &def1; Error *error = NULL; char *name, *features; @@ -1541,29 +1568,9 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) if (cpu_x86_parse_featurestr(def, features) < 0) { goto error; } - assert(def->vendor1); - env->cpuid_vendor1 = def->vendor1; - env->cpuid_vendor2 = def->vendor2; - env->cpuid_vendor3 = def->vendor3; - 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_features = 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); + if (error) { fprintf(stderr, "%s\n", error_get_pretty(error)); error_free(error);