[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/10] machine: MACHINE_TYPE_NAME macro
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 01/10] machine: MACHINE_TYPE_NAME macro |
Date: |
Thu, 20 Aug 2015 14:54:27 -0700 |
The macro will be useful to ensure the machine class names follow the
right format to make machine class lookup by class name work correctly.
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/hw/boards.h | 6 ++++++
vl.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 3f84afd..178517c 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -40,6 +40,12 @@ void memory_region_allocate_system_memory(MemoryRegion *mr,
Object *owner,
int qemu_register_machine(QEMUMachine *m);
#define TYPE_MACHINE_SUFFIX "-machine"
+
+/* Machine class name that needs to be used for class-name-based machine
+ * type lookup to work.
+ */
+#define MACHINE_TYPE_NAME(machinename) (machinename TYPE_MACHINE_SUFFIX)
+
#define TYPE_MACHINE "machine"
#undef MACHINE /* BSD defines it and QEMU does not use it */
#define MACHINE(obj) \
diff --git a/vl.c b/vl.c
index 584ca88..b7ddfeb 100644
--- a/vl.c
+++ b/vl.c
@@ -1447,7 +1447,7 @@ static void qemu_machine_class_init(ObjectClass *oc, void
*data)
int qemu_register_machine(QEMUMachine *m)
{
- char *name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL);
+ char *name = g_strdup_printf(MACHINE_TYPE_NAME("%s"), m->name);
TypeInfo ti = {
.name = name,
.parent = TYPE_MACHINE,
--
2.1.0
- [Qemu-devel] [PATCH 00/10] Fix machine class names to use the "-machine" suffix, Eduardo Habkost, 2015/08/20
- [Qemu-devel] [PATCH 03/10] vexpress: Rename machine classes to use MACHINE_TYPE_NAME, Eduardo Habkost, 2015/08/20
- [Qemu-devel] [PATCH 01/10] machine: MACHINE_TYPE_NAME macro,
Eduardo Habkost <=
- [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