From patchwork Thu Apr 11 14:51:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 235787 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 B9BE52C00C9 for ; Fri, 12 Apr 2013 01:01:15 +1000 (EST) Received: from localhost ([::1]:54244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIzy-0002yV-1t for incoming@patchwork.ozlabs.org; Thu, 11 Apr 2013 11:01:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIt9-0005Cf-JG for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:54:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQIt8-0007U4-By for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:54:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIt8-0007Tr-2Z for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:54:10 -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 r3BEq74C012048 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Apr 2013 10:52:07 -0400 Received: from thinkpad.redhat.com (vpn-239-94.phx2.redhat.com [10.3.239.94]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3BEpxKa026072; Thu, 11 Apr 2013 10:52:04 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2013 16:51:40 +0200 Message-Id: <1365691918-30594-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1365691918-30594-1-git-send-email-imammedo@redhat.com> References: <1365691918-30594-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: aliguori@us.ibm.com, ehabkost@redhat.com, claudio.fontana@huawei.com, aderumier@odiso.com, lcapitulino@redhat.com, jfrei@linux.vnet.ibm.com, yang.z.zhang@intel.com, pbonzini@redhat.com, afaerber@suse.de, lig.fnst@cn.fujitsu.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH 01/19] target-i386: split out CPU creation and features parsing into cpu_x86_create() 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 Move CPU creation and features parsing into a separate cpu_x86_create() function, so that board would be able to set board specific CPU properties before CPU is realized. Keep cpu_x86_init() for compatibility with the code that uses cpu_init() and doesn't need to modify CPU properties. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- v2: * use error_propagate() to rise error up stack --- target-i386/cpu.c | 18 +++++++++++++++--- target-i386/cpu.h | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f1ccc72..c28436c 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1564,7 +1564,7 @@ static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp) object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp); } -X86CPU *cpu_x86_init(const char *cpu_model) +X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) { X86CPU *cpu = NULL; CPUX86State *env; @@ -1594,13 +1594,25 @@ X86CPU *cpu_x86_init(const char *cpu_model) goto out; } - object_property_set_bool(OBJECT(cpu), true, "realized", &error); +out: + error_propagate(errp, error); + g_strfreev(model_pieces); + return cpu; +} + +X86CPU *cpu_x86_init(const char *cpu_model) +{ + Error *error = NULL; + X86CPU *cpu; + + cpu = cpu_x86_create(cpu_model, &error); if (error) { goto out; } + object_property_set_bool(OBJECT(cpu), true, "realized", &error); + out: - g_strfreev(model_pieces); if (error) { fprintf(stderr, "%s\n", error_get_pretty(error)); error_free(error); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 2b4e319..cf1b05c 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -896,6 +896,7 @@ typedef struct CPUX86State { #include "cpu-qom.h" X86CPU *cpu_x86_init(const char *cpu_model); +X86CPU *cpu_x86_create(const char *cpu_model, Error **errp); int cpu_x86_exec(CPUX86State *s); void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); void x86_cpudef_setup(void);