[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/21] machine: Ensure all TYPE_MACHINE subclasses ha
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 12/21] machine: Ensure all TYPE_MACHINE subclasses have the right suffix |
Date: |
Sat, 19 Sep 2015 16:43:21 +0200 |
From: Eduardo Habkost <address@hidden>
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>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Andreas Färber <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 51ed6b2..3c1f248 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -316,6 +316,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);
@@ -492,6 +500,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.4
- [Qemu-devel] [PULL 00/21] QOM devices patch queue 2015-09-19, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 04/21] machine: MACHINE_TYPE_NAME macro, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 03/21] qdev: Do not use slow [*] expansion for GPIO creation, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 02/21] qom: Fix invalid error check in property_get_str(), Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 01/21] qom: Do not reuse errp after a possible error, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 05/21] vexpress: Don't set name on abstract class, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 06/21] vexpress: Rename machine classes to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 07/21] arm: Rename virt machine class to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 09/21] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 12/21] machine: Ensure all TYPE_MACHINE subclasses have the right suffix,
Andreas Färber <=
- [Qemu-devel] [PULL 10/21] s390: Rename s390-ccw-virtio-2.4 class name to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 08/21] pseries: Rename machine class names to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 11/21] mac99: Use MACHINE_TYPE_NAME to encode class name, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 14/21] exynos4: Use EXYNOS4210_NCPUS instead of max_cpus on error message, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 13/21] machine: Set MachineClass::name automatically, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 15/21] exynos4: Use MachineClass instead of exynos4_machines array, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 16/21] exynos4: Declare each QEMUMachine as a separate variable, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 17/21] machine: DEFINE_MACHINE() macro, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 18/21] mac_world: Break long line, Andreas Färber, 2015/09/19