From: Andreas Färber <afaerber@suse.de>
Date: Wed, 23 Jan 2013 11:39:38 +0000 (+0100)
Subject: target-openrisc: Catch attempt to instantiate abstract type in cpu_init()
X-Git-Tag: v1.4.0-rc0~75^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c432b7840cfbc35fc0d097428d0a2f2a94983360;p=thirdparty%2Fqemu.git

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

There is no abstract OpenRISCCPU yet, but that seems a bug of its own.

Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
index e23100fa098..adc03ef7796 100644
--- a/target-openrisc/cpu.c
+++ b/target-openrisc/cpu.c
@@ -98,7 +98,8 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model)
     }
 
     oc = object_class_by_name(cpu_model);
-    if (oc != NULL && !object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU)) {
+    if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) ||
+                       object_class_is_abstract(oc))) {
         return NULL;
     }
     return oc;