From: Andreas Färber <afaerber@suse.de>
Date: Mon, 21 Jan 2013 16:27:54 +0000 (+0100)
Subject: target-alpha: Detect attempt to instantiate non-CPU type in cpu_init()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0e44a02301b081d36e686e767694a770c25160a2;p=qemu.git

target-alpha: Detect attempt to instantiate non-CPU type in cpu_init()

Check in alpha_cpu_class_by_name() whether the type found is actually
(a sub-type of) TYPE_ALPHA_CPU.

This fixes, e.g., -cpu typhoon-pcihost asserting.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index 3ac0fde2cd..0d6975ea9b 100644
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -96,7 +96,7 @@ static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model)
     }
 
     oc = object_class_by_name(cpu_model);
-    if (oc != NULL) {
+    if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL) {
         return oc;
     }