From: Andreas Färber <afaerber@suse.de>
Date: Wed, 23 Jan 2013 11:36:31 +0000 (+0100)
Subject: target-m68k: Catch attempt to instantiate abstract type in cpu_init()
X-Git-Tag: v1.4.0-rc0~75^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cae85065a44b731467dc6a5caee7cfc6d26d9ca3;p=users%2Fdwmw2%2Fqemu.git

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

This fixes -cpu m68k-cpu asserting.

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

diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index b231d9ad38..e6df1eef58 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -64,7 +64,8 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model)
     }
 
     oc = object_class_by_name(cpu_model);
-    if (oc != NULL && object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL) {
+    if (oc != NULL && (object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL ||
+                       object_class_is_abstract(oc))) {
         return NULL;
     }
     return oc;