diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-21 17:50:15 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-01-27 14:52:05 +0100 |
| commit | bc5b2da32ba54d991e8669b14a771afb3a67f408 (patch) | |
| tree | 9e9d37acb0bf8fca8aeebe5722226cc16087d1d6 /target-m68k | |
| parent | 0e44a02301b081d36e686e767694a770c25160a2 (diff) | |
target-m68k: Detect attempt to instantiate non-CPU type in cpu_init()
Consolidate model checking into a new m68k_cpu_class_by_name().
If the name matches an existing type, also check whether that type is
(a sub-type of) TYPE_M68K_CPU.
This fixes, e.g., -cpu ide-hd asserting.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-m68k')
| -rw-r--r-- | target-m68k/cpu.c | 17 | ||||
| -rw-r--r-- | target-m68k/helper.c | 6 |
2 files changed, 21 insertions, 2 deletions
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index ce89674a08..b231d9ad38 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -55,6 +55,21 @@ static void m68k_cpu_reset(CPUState *s) /* CPU models */ +static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model) +{ + ObjectClass *oc; + + if (cpu_model == NULL) { + return NULL; + } + + oc = object_class_by_name(cpu_model); + if (oc != NULL && object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL) { + return NULL; + } + return oc; +} + static void m5206_cpu_initfn(Object *obj) { M68kCPU *cpu = M68K_CPU(obj); @@ -134,6 +149,8 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data) mcc->parent_reset = cc->reset; cc->reset = m68k_cpu_reset; + + cc->class_by_name = m68k_cpu_class_by_name; } static void register_cpu_type(const M68kCPUInfo *info) diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 097fc789d4..f66e12b6ba 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -97,12 +97,14 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) { M68kCPU *cpu; CPUM68KState *env; + ObjectClass *oc; static int inited; - if (object_class_by_name(cpu_model) == NULL) { + oc = cpu_class_by_name(TYPE_M68K_CPU, cpu_model); + if (oc == NULL) { return NULL; } - cpu = M68K_CPU(object_new(cpu_model)); + cpu = M68K_CPU(object_new(object_class_get_name(oc))); env = &cpu->env; if (!inited) { |