@@ -8,7 +8,7 @@ static void qdev_prop_register_global(GlobalProperty *prop)
QTAILQ_INSERT_TAIL(&global_props, prop, next);
}
-void qdev_prop_register_global_list(GlobalProperty *props)
+void qemu_globals_register_list(GlobalProperty *props)
{
int i;
@@ -329,12 +329,14 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name, int value);
/* FIXME: Remove opaque pointer properties. */
void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);
-void qdev_prop_register_global_list(GlobalProperty *props);
-void qdev_prop_set_globals(DeviceState *dev);
-void object_prop_set_globals(Object *obj);
void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,
Property *prop, const char *value);
+/* Handling of global properties: */
+void qemu_globals_register_list(GlobalProperty *props);
+void qdev_prop_set_globals(DeviceState *dev);
+void object_prop_set_globals(Object *obj);
+
char *qdev_get_fw_dev_path(DeviceState *dev);
/**
@@ -559,7 +559,7 @@ static void configure_rtc(QemuOpts *opts)
{ /* end of list */ }
};
- qdev_prop_register_global_list(slew_lost_ticks);
+ qemu_globals_register_list(slew_lost_ticks);
} else if (!strcmp(value, "none")) {
/* discard is default */
} else {
@@ -2951,7 +2951,7 @@ int main(int argc, char **argv, char **envp)
{ /* end of list */ }
};
- qdev_prop_register_global_list(slew_lost_ticks);
+ qemu_globals_register_list(slew_lost_ticks);
break;
}
case QEMU_OPTION_acpitable:
@@ -3510,7 +3510,7 @@ int main(int argc, char **argv, char **envp)
}
if (machine->compat_props) {
- qdev_prop_register_global_list(machine->compat_props);
+ qemu_globals_register_list(machine->compat_props);
}
qemu_add_globals();
The function is not qdev-specific, it just keeps a global driver/property/value list. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- global-properties.c | 2 +- hw/qdev.h | 8 +++++--- vl.c | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-)