From: Andreas Färber <afaerber@suse.de>
Date: Wed, 23 Jan 2013 11:32:49 +0000 (+0100)
Subject: target-arm: Catch attempt to instantiate abstract type in cpu_init()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=245fb54db5f8c88c9d73e037178bc3ca1f9a4bb6;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

target-arm: Catch attempt to instantiate abstract type in cpu_init()

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>
---

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 57126b685..d1a4c8268 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;