From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgUw-00043f-3T for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:29:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIgUj-0004FQ-U8 for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:29:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10899) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIgUj-0004Bk-El for qemu-devel@nongnu.org; Thu, 21 Mar 2013 10:29:29 -0400 From: Igor Mammedov Date: Thu, 21 Mar 2013 15:28:36 +0100 Message-Id: <1363876125-8264-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1363876125-8264-1-git-send-email-imammedo@redhat.com> References: <1363876125-8264-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 03/12] target-i386: split out CPU creation and features parsing into cpu_x86_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, stefano.stabellini@eu.citrix.com, claudio.fontana@huawei.com, armbru@redhat.com, quintela@redhat.com, lcapitulino@redhat.com, blauwirbel@gmail.com, yang.z.zhang@intel.com, alex.williamson@redhat.com, aderumier@odiso.com, kraxel@redhat.com, anthony.perard@citrix.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net 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 --- target-i386/cpu.c | 28 +++++++++++++++++++--------- target-i386/cpu.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index affbb76..c20b81f 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1562,17 +1562,16 @@ 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; gchar **model_pieces; char *name, *features; - Error *error = NULL; model_pieces = g_strsplit(cpu_model, ",", 2); if (!model_pieces[0]) { - error_setg(&error, "Invalid/empty CPU model name"); + error_setg(errp, "Invalid/empty CPU model name"); goto out; } name = model_pieces[0]; @@ -1582,23 +1581,34 @@ X86CPU *cpu_x86_init(const char *cpu_model) env = &cpu->env; env->cpu_model_str = cpu_model; - cpu_x86_register(cpu, name, &error); - if (error) { + cpu_x86_register(cpu, name, errp); + if (error_is_set(errp)) { goto out; } - cpu_x86_parse_featurestr(cpu, features, &error); - if (error) { + cpu_x86_parse_featurestr(cpu, features, errp); + if (error_is_set(errp)) { goto out; } - object_property_set_bool(OBJECT(cpu), true, "realized", &error); +out: + 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 48f41ca..7de18a2 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); -- 1.7.1