ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-i386: Split out CPU creation and features parsing 

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 <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Igor Mammedov 2013-04-11 16:51:40 +02:00 committed by Andreas Färber
parent dd13e08804
commit 7f833247df
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target-i386/cpu.c
View File

@ -1563,7 +1563,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); 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; X86CPU *cpu = NULL;
CPUX86State *env; CPUX86State *env;
@ -1593,13 +1593,25 @@ X86CPU *cpu_x86_init(const char *cpu_model)
goto out; 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) { if (error) {
goto out; goto out;
} }
object_property_set_bool(OBJECT(cpu), true, "realized", &error);
out: out:
g_strfreev(model_pieces);
if (error) { if (error) {
fprintf(stderr, "%s\n", error_get_pretty(error)); fprintf(stderr, "%s\n", error_get_pretty(error));
error_free(error); error_free(error);

1
target-i386/cpu.h
View File

@ -896,6 +896,7 @@ typedef struct CPUX86State {
#include "cpu-qom.h" #include "cpu-qom.h"
X86CPU *cpu_x86_init(const char *cpu_model); X86CPU *cpu_x86_init(const char *cpu_model);
X86CPU *cpu_x86_create(const char *cpu_model, Error **errp);
int cpu_x86_exec(CPUX86State *s); int cpu_x86_exec(CPUX86State *s);
void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf);
void x86_cpudef_setup(void); void x86_cpudef_setup(void);