[qom-cpu,for-1.4,14/14] target-unicore32: Catch attempt to instantiate abstract type in cpu_init()

Submitted by Andreas Färber on Jan. 23, 2013, 12:07 p.m.

Details

Message ID 1358942867-8612-15-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber Jan. 23, 2013, 12:07 p.m.
Fixes -cpu unicore32-cpu asserting.

Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-unicore32/cpu.c |    3 ++-
 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

Patch hide | download patch | download mbox

diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
index e9b9254..0142d7e 100644
--- a/target-unicore32/cpu.c
+++ b/target-unicore32/cpu.c
@@ -31,7 +31,8 @@  static ObjectClass *uc32_cpu_class_by_name(const char *cpu_model)
     }
 
     oc = object_class_by_name(cpu_model);
-    if (oc != NULL && object_class_dynamic_cast(oc, TYPE_UNICORE32_CPU)) {
+    if (oc != NULL && (object_class_dynamic_cast(oc, TYPE_UNICORE32_CPU) ||
+                       object_class_is_abstract(oc))) {
         oc = NULL;
     }
     return oc;