[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] machine: Ensure all TYPE_MACHINE subclasses h
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 09/10] machine: Ensure all TYPE_MACHINE subclasses have the right suffix |
Date: |
Thu, 20 Aug 2015 14:54:35 -0700 |
Now that all non-abstract TYPE_MACHINE subclasses have the -machine
suffix, add an assert to ensure this will be always true.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/core/machine.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index ac4654e..e50c4b7 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -302,6 +302,14 @@ static void machine_class_init(ObjectClass *oc, void *data)
mc->default_ram_size = 128 * M_BYTE;
}
+static void machine_class_base_init(ObjectClass *oc, void *data)
+{
+ if (!object_class_is_abstract(oc)) {
+ const char *cname = object_class_get_name(oc);
+ assert(g_str_has_suffix(cname, TYPE_MACHINE_SUFFIX));
+ }
+}
+
static void machine_initfn(Object *obj)
{
MachineState *ms = MACHINE(obj);
@@ -472,6 +480,7 @@ static const TypeInfo machine_info = {
.abstract = true,
.class_size = sizeof(MachineClass),
.class_init = machine_class_init,
+ .class_base_init = machine_class_base_init,
.instance_size = sizeof(MachineState),
.instance_init = machine_initfn,
.instance_finalize = machine_finalize,
--
2.1.0
- Re: [Qemu-devel] [PATCH 01/10] machine: MACHINE_TYPE_NAME macro, (continued)
- [Qemu-devel] [PATCH 02/10] vexpress: Don't set name on abstract class, Eduardo Habkost, 2015/08/20
- [Qemu-devel] [PATCH 05/10] pseries: Rename machine class names to use MACHINE_TYPE_NAME, Eduardo Habkost, 2015/08/20
- [Qemu-devel] [PATCH 04/10] arm: Rename virt machine class to use MACHINE_TYPE_NAME, Eduardo Habkost, 2015/08/20
- [Qemu-devel] [PATCH 06/10] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME, Eduardo Habkost, 2015/08/20
- [Qemu-devel] [PATCH 09/10] machine: Ensure all TYPE_MACHINE subclasses have the right suffix,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 08/10] mac99: Use MACHINE_TYPE_NAME to encode class name, Eduardo Habkost, 2015/08/20
- [Qemu-devel] [PATCH 07/10] s390: Rename s390-ccw-virtio-2.4 class name to use MACHINE_TYPE_NAME, Eduardo Habkost, 2015/08/20
- [Qemu-devel] [PATCH 10/10] machine: Set MachineClass::name automatically, Eduardo Habkost, 2015/08/20
- Re: [Qemu-devel] [PATCH 00/10] Fix machine class names to use the "-machine" suffix, Cornelia Huck, 2015/08/21