[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu for-1.4 10/14] target-alpha: Catch attempt t
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-cpu for-1.4 10/14] target-alpha: Catch attempt to instantiate abstract type in cpu_init() |
Date: |
Wed, 23 Jan 2013 13:07:43 +0100 |
This fixes -cpu alpha-cpu asserting.
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
---
target-alpha/cpu.c | 8 ++++++--
1 Datei geändert, 6 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index 0d6975e..0ad69f0 100644
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -96,14 +96,15 @@ static ObjectClass *alpha_cpu_class_by_name(const char
*cpu_model)
}
oc = object_class_by_name(cpu_model);
- if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL) {
+ if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL &&
+ !object_class_is_abstract(oc)) {
return oc;
}
for (i = 0; i < ARRAY_SIZE(alpha_cpu_aliases); i++) {
if (strcmp(cpu_model, alpha_cpu_aliases[i].alias) == 0) {
oc = object_class_by_name(alpha_cpu_aliases[i].typename);
- assert(oc != NULL);
+ assert(oc != NULL && !object_class_is_abstract(oc));
return oc;
}
}
@@ -111,6 +112,9 @@ static ObjectClass *alpha_cpu_class_by_name(const char
*cpu_model)
typename = g_strdup_printf("%s-" TYPE_ALPHA_CPU, cpu_model);
oc = object_class_by_name(typename);
g_free(typename);
+ if (oc != NULL && object_class_is_abstract(oc)) {
+ oc = NULL;
+ }
return oc;
}
--
1.7.10.4
- [Qemu-devel] [PATCH qom-cpu for-1.4 07/14] target-openrisc: Detect attempt to instantiate non-CPU type in cpu_init(), (continued)
- [Qemu-devel] [PATCH qom-cpu for-1.4 07/14] target-openrisc: Detect attempt to instantiate non-CPU type in cpu_init(), Andreas Färber, 2013/01/23
- [Qemu-devel] [PATCH qom-cpu for-1.4 01/14] target-openrisc: Don't use type_register_static(), Andreas Färber, 2013/01/23
- [Qemu-devel] [PATCH qom-cpu for-1.4 13/14] target-openrisc: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/23
- [Qemu-devel] [PATCH qom-cpu for-1.4 08/14] target-unicore32: Detect attempt to instantiate non-CPU type in cpu_init(), Andreas Färber, 2013/01/23
- [Qemu-devel] [PATCH qom-cpu for-1.4 12/14] target-m68k: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/23
- [Qemu-devel] [PATCH qom-cpu for-1.4 05/14] target-alpha: Detect attempt to instantiate non-CPU type in cpu_init(), Andreas Färber, 2013/01/23
- [Qemu-devel] [PATCH qom-cpu for-1.4 11/14] target-arm: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/23
- [Qemu-devel] [PATCH qom-cpu for-1.4 14/14] target-unicore32: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/23
- [Qemu-devel] [PATCH qom-cpu for-1.4 10/14] target-alpha: Catch attempt to instantiate abstract type in cpu_init(),
Andreas Färber <=
- Re: [Qemu-devel] [PATCH qom-cpu for-1.4 00/14] QOM CPU fixes for 1.4, Andreas Färber, 2013/01/26
- Re: [Qemu-devel] [PATCH qom-cpu for-1.4 00/14] QOM CPU fixes for 1.4, Andreas Färber, 2013/01/27