From patchwork Tue May 29 22:10: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: 161820 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 37447B6FD9 for ; Wed, 30 May 2012 09:08:45 +1000 (EST) Received: from localhost ([::1]:37597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZUde-0002ua-H6 for incoming@patchwork.ozlabs.org; Tue, 29 May 2012 18:11:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZUdD-00029S-OY for qemu-devel@nongnu.org; Tue, 29 May 2012 18:11:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZUd9-0006jh-04 for qemu-devel@nongnu.org; Tue, 29 May 2012 18:11:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZUd8-0006jO-Ng for qemu-devel@nongnu.org; Tue, 29 May 2012 18:11:06 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4TMB1aj029396 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 29 May 2012 18:11:01 -0400 Received: from nial.brq.redhat.com (dhcp-1-247.brq.redhat.com [10.34.1.247]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4TMAQiH013345; Tue, 29 May 2012 18:10:58 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 30 May 2012 00:10:21 +0200 Message-Id: <1338329426-28118-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1338329426-28118-1-git-send-email-imammedo@redhat.com> References: <1338329426-28118-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, ehabkost@redhat.com, stefano.stabellini@eu.citrix.com, sw@weilnetz.de, mtosatti@redhat.com, agraf@suse.de, blauwirbel@gmail.com, jcmvbkbc@gmail.com, avi@redhat.com, jan.kiszka@siemens.com, anthony.perard@citrix.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH qom-next 08/12] target-i386: introduce cpu-model property for x86_cpu 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 it's probably intermidiate step till cpu modeled as sub-classes. After then we probably could drop it. However it still could be used for overiding default cpu subclasses definition, and probably renamed to something like 'features'. v2: - remove accidential tcg_* init code move Signed-off-by: Igor Mammedov --- cpu-defs.h | 2 +- hw/pc.c | 10 ---------- target-i386/cpu.c | 24 ++++++++++++++++++++++++ target-i386/helper.c | 17 ++++++++++++----- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/cpu-defs.h b/cpu-defs.h index f49e950..8f4623c 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -221,7 +221,7 @@ typedef struct CPUWatchpoint { struct QemuCond *halt_cond; \ int thread_kicked; \ struct qemu_work_item *queued_work_first, *queued_work_last; \ - const char *cpu_model_str; \ + char *cpu_model_str; \ struct KVMState *kvm_state; \ struct kvm_run *kvm_run; \ int kvm_fd; \ diff --git a/hw/pc.c b/hw/pc.c index 2f681db..4a687d6 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -948,7 +948,6 @@ static X86CPU *pc_new_cpu(const char *cpu_model) cpu = cpu_x86_init(cpu_model); if (cpu == NULL) { - fprintf(stderr, "Unable to find x86 CPU definition\n"); exit(1); } env = &cpu->env; @@ -974,15 +973,6 @@ void pc_cpus_init(const char *cpu_model) { int i; - /* init CPUs */ - if (cpu_model == NULL) { -#ifdef TARGET_X86_64 - cpu_model = "qemu64"; -#else - cpu_model = "qemu32"; -#endif - } - for(i = 0; i < smp_cpus; i++) { pc_new_cpu(cpu_model); } diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f029f2a..2610d96 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1731,6 +1731,27 @@ static void mce_init(X86CPU *cpu) } } +static char *x86_get_cpu_model(Object *obj, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + return g_strdup(env->cpu_model_str); +} + +static void x86_set_cpu_model(Object *obj, const char *value, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + + g_free((gpointer)env->cpu_model_str); + env->cpu_model_str = g_strdup(value); + + if (cpu_x86_register(cpu, env->cpu_model_str) < 0) { + fprintf(stderr, "Unable to find x86 CPU definition\n"); + error_set(errp, QERR_INVALID_PARAMETER_COMBINATION); + } +} + void x86_cpu_realize(Object *obj, Error **errp) { X86CPU *cpu = X86_CPU(obj); @@ -1772,6 +1793,9 @@ static void x86_cpu_initfn(Object *obj) x86_cpuid_get_tsc_freq, x86_cpuid_set_tsc_freq, NULL, NULL, NULL); + object_property_add_str(obj, "cpu-model", + x86_get_cpu_model, x86_set_cpu_model, NULL); + env->cpuid_apic_id = env->cpu_index; /* init various static tables used in TCG mode */ diff --git a/target-i386/helper.c b/target-i386/helper.c index fd20fd4..748eee8 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1152,14 +1152,21 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector, X86CPU *cpu_x86_init(const char *cpu_model) { X86CPU *cpu; - CPUX86State *env; + Error *errp = NULL; cpu = X86_CPU(object_new(TYPE_X86_CPU)); - env = &cpu->env; - env->cpu_model_str = cpu_model; - if (cpu_x86_register(cpu, cpu_model) < 0) { - object_delete(OBJECT(cpu)); + if (cpu_model) { + object_property_set_str(OBJECT(cpu), cpu_model, "cpu-model", &errp); + } else { +#ifdef TARGET_X86_64 + object_property_set_str(OBJECT(cpu), "qemu64", "cpu-model", &errp); +#else + object_property_set_str(OBJECT(cpu), "qemu32", "cpu-model", &errp); +#endif + } + if (errp) { + object_delete(OBJECT(cpu)); return NULL; }