[Qemu-stable] [PATCH qom-cpu for-1.4 11/14] target-arm: Catch attempt to instantiate abstract type in cpu_init()

[Andreas Färber]

This fixes -cpu arm-cpu asserting.

Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
---
 target-arm/cpu.c |    3 ++-
 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index d85f251..cfc14f3 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 == NULL || object_class_dynamic_cast(oc, TYPE_ARM_CPU) == NULL) {
+    if (oc == NULL || object_class_dynamic_cast(oc, TYPE_ARM_CPU) == NULL ||
+        object_class_is_abstract(oc)) {
         return NULL;
     }
     return oc;
-- 
1.7.10.4