This will make it easier to write reusable class_init code which adds
properties to MachineClass.compat_props.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
hw/core/machine.c | 15 +++++++++++++++
hw/core/qdev-properties.c | 9 +++++----
hw/i386/pc.c | 4 +++-
include/hw/boards.h | 10 +++++++++-
include/hw/qdev-core.h | 2 ++
include/hw/qdev-properties.h | 2 +-
vl.c | 8 ++++----
7 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index cbba679..a4d928e 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -290,12 +290,27 @@ 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++) {
+ QTAILQ_INSERT_TAIL(&mc->compat_props, &props[i], next);
+ }
+}
+
+static void machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ QTAILQ_INIT(&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_init = machine_class_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..7f6509c 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -946,12 +946,13 @@ void qdev_prop_register_global(GlobalProperty *prop)
QTAILQ_INSERT_TAIL(&global_props, prop, next);
}
-void qdev_prop_register_global_list(GlobalProperty *props)
+void qdev_prop_register_global_list(GlobalPropertyList *props)
{
- int i;
+ GlobalProperty *prop, *nprop;
- for (i = 0; props[i].driver != NULL; i++) {
- qdev_prop_register_global(props+i);
+ QTAILQ_FOREACH_SAFE(prop, props, next, nprop) {
+ QTAILQ_REMOVE(props, prop, next);
+ qdev_prop_register_global(prop);
}
}
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 7cdba10..62f3c39 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1532,8 +1532,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 429ac43..8753a20 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -4,6 +4,7 @@
#define HW_BOARDS_H
#include "qemu/typedefs.h"
+#include "qemu/queue.h"
#include "sysemu/blockdev.h"
#include "hw/qdev.h"
#include "qom/object.h"
@@ -93,7 +94,7 @@ struct MachineClass {
int is_default;
const char *default_machine_opts;
const char *default_boot_order;
- GlobalProperty *compat_props;
+ GlobalPropertyList compat_props;
const char *hw_version;
HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
@@ -101,6 +102,13 @@ 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);
+
+/**
* MachineState:
*/
struct MachineState {
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 9221cfc..6df479b 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -254,6 +254,8 @@ typedef struct GlobalProperty {
QTAILQ_ENTRY(GlobalProperty) next;
} GlobalProperty;
+typedef QTAILQ_HEAD(GlobalPropertyList, GlobalProperty) GlobalPropertyList;
+
/*** Board API. This should go away once we have a machine config file. ***/
DeviceState *qdev_create(BusState *bus, const char *name);
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index c962b6b..59b3bcc 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -179,7 +179,7 @@ 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);
+void qdev_prop_register_global_list(GlobalPropertyList *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 8d3d2a6..b26d033 100644
--- a/vl.c
+++ b/vl.c
@@ -1616,8 +1616,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)
@@ -4468,9 +4470,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);
- }
+ qdev_prop_register_global_list(&machine_class->compat_props);
qemu_add_globals();
qdev_machine_init();
--
1.9.0
