[29/37] target-arm: Catch attempt to instantiate abstract type in cpu_init()

Submitted by Andreas Färber on Jan. 28, 2013, 4:18 p.m.

Details

Message ID 1359389934-16663-30-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber Jan. 28, 2013, 4:18 p.m.
This fixes -cpu arm-cpu asserting.

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

Patch hide | download patch | download mbox

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 57126b6..d1a4c82 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -210,7 +210,8 @@  static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)
     }
 
     oc = object_class_by_name(cpu_model);
-    if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU)) {
+    if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) ||
+        object_class_is_abstract(oc)) {
         return NULL;
     }
     return oc;