openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target-i386: Prepare CPUClass::class_by_name for X86CPU 

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2014-02-10 22:02:44 +01:00
parent ef02ef5f45
commit 500050d1e0
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target-i386/cpu.c
View File

@ -490,6 +490,15 @@ static void add_flagname_to_bitmaps(const char *flagname,
} }
} }
static ObjectClass *x86_cpu_class_by_name(const char *cpu_model)
{
if (cpu_model == NULL) {
return NULL;
}
return object_class_by_name(TYPE_X86_CPU);
}
typedef struct X86CPUDefinition { typedef struct X86CPUDefinition {
const char *name; const char *name;
uint32_t level; uint32_t level;
@ -1890,6 +1899,7 @@ X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge,
Error **errp) Error **errp)
{ {
X86CPU *cpu = NULL; X86CPU *cpu = NULL;
ObjectClass *oc;
gchar **model_pieces; gchar **model_pieces;
char *name, *features; char *name, *features;
char *typename; char *typename;
@ -1903,7 +1913,12 @@ X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge,
name = model_pieces[0]; name = model_pieces[0];
features = model_pieces[1]; features = model_pieces[1];
cpu = X86_CPU(object_new(TYPE_X86_CPU)); oc = x86_cpu_class_by_name(name);
if (oc == NULL) {
error_setg(&error, "Unable to find CPU definition: %s", name);
goto out;
}
cpu = X86_CPU(object_new(object_class_get_name(oc)));
x86_cpu_load_def(cpu, name, &error); x86_cpu_load_def(cpu, name, &error);
if (error) { if (error) {
goto out; goto out;
@ -1934,8 +1949,10 @@ X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge,
out: out:
if (error != NULL) { if (error != NULL) {
error_propagate(errp, error); error_propagate(errp, error);
object_unref(OBJECT(cpu)); if (cpu) {
cpu = NULL; object_unref(OBJECT(cpu));
cpu = NULL;
}
} }
g_strfreev(model_pieces); g_strfreev(model_pieces);
return cpu; return cpu;
@ -2748,6 +2765,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
cc->reset = x86_cpu_reset; cc->reset = x86_cpu_reset;
cc->reset_dump_flags = CPU_DUMP_FPU | CPU_DUMP_CCOP; cc->reset_dump_flags = CPU_DUMP_FPU | CPU_DUMP_CCOP;
cc->class_by_name = x86_cpu_class_by_name;
cc->has_work = x86_cpu_has_work; cc->has_work = x86_cpu_has_work;
cc->do_interrupt = x86_cpu_do_interrupt; cc->do_interrupt = x86_cpu_do_interrupt;
cc->dump_state = x86_cpu_dump_state; cc->dump_state = x86_cpu_dump_state;