[Qemu-devel] [PATCH v4 10/33] machine: Make compat_props a linked list

[Eduardo Habkost]

This will make it easier to write reusable class_init code which adds
properties to MachineClass.compat_props.

Use GList instead of reusing GlobalProperty.next, because the same
GlobalProperty can appear on multiple machine subclasses.

Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v3 -> v4:
* Use GList instead of reusing the "next" field on GlobalProperty,
  so the same GlobalProperty elements may be added to multiple classes.
---
 hw/core/machine.c            | 25 +++++++++++++++++++++++++
 hw/core/qdev-properties.c    |  9 ---------
 hw/i386/pc.c                 |  4 +++-
 include/hw/boards.h          | 19 ++++++++++++++++++-
 include/hw/qdev-properties.h |  1 -
 vl.c                         |  8 ++++----
 6 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 7a66c57..3eeb0a9 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -290,12 +290,37 @@ static void machine_finalize(Object *obj)
     g_free(ms->firmware);
 }
 
+void machine_class_add_compat_props(MachineClass *mc, GlobalProperty *props)
+{
+    int i;
+    for (i = 0; props[i].driver; i++) {
+        mc->compat_props = g_list_append(mc->compat_props, &props[i]);
+    }
+}
+
+void machine_class_register_compat_props(MachineClass *mc)
+{
+    GList *l;
+    for (l = mc->compat_props; l; l = l->next) {
+        GlobalProperty *prop = l->data;
+        qdev_prop_register_global(prop);
+    }
+}
+
+static void machine_class_base_init(ObjectClass *oc, void *data)
+{
+    MachineClass *mc = MACHINE_CLASS(oc);
+    /* compat_props can't be simply memcpy()ed */
+    mc->compat_props = g_list_copy(mc->compat_props);
+}
+
 static const TypeInfo machine_info = {
     .name = TYPE_MACHINE,
     .parent = TYPE_OBJECT,
     .abstract = true,
     .class_size = sizeof(MachineClass),
     .instance_size = sizeof(MachineState),
+    .class_base_init = machine_class_base_init,
     .instance_init = machine_initfn,
     .instance_finalize = machine_finalize,
 };
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 3d12560..4dd9faa 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -946,15 +946,6 @@ void qdev_prop_register_global(GlobalProperty *prop)
     QTAILQ_INSERT_TAIL(&global_props, prop, next);
 }
 
-void qdev_prop_register_global_list(GlobalProperty *props)
-{
-    int i;
-
-    for (i = 0; props[i].driver != NULL; i++) {
-        qdev_prop_register_global(props+i);
-    }
-}
-
 int qdev_prop_check_global(void)
 {
     GlobalProperty *prop;
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 9e58982..301b127 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1556,8 +1556,10 @@ static void pc_generic_machine_class_init(ObjectClass 
*oc, void *data)
     mc->is_default = qm->is_default;
     mc->default_machine_opts = qm->default_machine_opts;
     mc->default_boot_order = qm->default_boot_order;
-    mc->compat_props = qm->compat_props;
     mc->hw_version = qm->hw_version;
+    if (qm->compat_props) {
+        machine_class_add_compat_props(mc, qm->compat_props);
+    }
 }
 
 void qemu_register_pc_machine(QEMUMachine *m)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 605a970..e9ddbc9 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -3,6 +3,8 @@
 #ifndef HW_BOARDS_H
 #define HW_BOARDS_H
 
+#include <glib.h>
+
 #include "qemu/typedefs.h"
 #include "sysemu/blockdev.h"
 #include "hw/qdev.h"
@@ -97,7 +99,7 @@ struct MachineClass {
     int is_default;
     const char *default_machine_opts;
     const char *default_boot_order;
-    GlobalProperty *compat_props;
+    GList *compat_props;
     const char *hw_version;
 
     HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
@@ -105,6 +107,21 @@ struct MachineClass {
 };
 
 /**
+ * machine_class_add_compat_props:
+ *
+ * Adds compat props from an array to the MachineClass compat_props list.
+ */
+void machine_class_add_compat_props(MachineClass *mc, GlobalProperty *props);
+
+/**
+ * machine_class_register_compat_props:
+ *
+ * Register the compat props that were added using
+ * machine_class_add_compat_props().
+ */
+void machine_class_register_compat_props(MachineClass *mc);
+
+/**
  * MachineState:
  */
 struct MachineState {
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 77fe3a1..4480b3e 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -176,7 +176,6 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name, 
int value);
 void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);
 
 void qdev_prop_register_global(GlobalProperty *prop);
-void qdev_prop_register_global_list(GlobalProperty *props);
 int qdev_prop_check_global(void);
 void qdev_prop_set_globals(DeviceState *dev, Error **errp);
 void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typename,
diff --git a/vl.c b/vl.c
index 1dd12a8..140fea4 100644
--- a/vl.c
+++ b/vl.c
@@ -1587,8 +1587,10 @@ static void machine_class_init(ObjectClass *oc, void 
*data)
     mc->is_default = qm->is_default;
     mc->default_machine_opts = qm->default_machine_opts;
     mc->default_boot_order = qm->default_boot_order;
-    mc->compat_props = qm->compat_props;
     mc->hw_version = qm->hw_version;
+    if (qm->compat_props) {
+        machine_class_add_compat_props(mc, qm->compat_props);
+    }
 }
 
 int qemu_register_machine(QEMUMachine *m)
@@ -4410,9 +4412,7 @@ int main(int argc, char **argv, char **envp)
             exit (i == 1 ? 1 : 0);
     }
 
-    if (machine_class->compat_props) {
-        qdev_prop_register_global_list(machine_class->compat_props);
-    }
+    machine_class_register_compat_props(machine_class);
     qemu_add_globals();
 
     qdev_machine_init();
-- 
1.9.3