qdev-props: convert global_props to GPtrArray
A step towards being able to call a common function, object_apply_global_props(). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
55df8e1a2f
commit
e12ca3ce1c
@ -1173,22 +1173,32 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value)
|
||||
*ptr = value;
|
||||
}
|
||||
|
||||
static GList *global_props;
|
||||
static GPtrArray *global_props(void)
|
||||
{
|
||||
static GPtrArray *gp;
|
||||
|
||||
if (!gp) {
|
||||
gp = g_ptr_array_new();
|
||||
}
|
||||
|
||||
return gp;
|
||||
}
|
||||
|
||||
void qdev_prop_register_global(GlobalProperty *prop)
|
||||
{
|
||||
global_props = g_list_append(global_props, prop);
|
||||
g_ptr_array_add(global_props(), prop);
|
||||
}
|
||||
|
||||
int qdev_prop_check_globals(void)
|
||||
{
|
||||
GList *l;
|
||||
int ret = 0;
|
||||
int i, ret = 0;
|
||||
|
||||
for (l = global_props; l; l = l->next) {
|
||||
GlobalProperty *prop = l->data;
|
||||
for (i = 0; i < global_props()->len; i++) {
|
||||
GlobalProperty *prop;
|
||||
ObjectClass *oc;
|
||||
DeviceClass *dc;
|
||||
|
||||
prop = g_ptr_array_index(global_props(), i);
|
||||
if (prop->used) {
|
||||
continue;
|
||||
}
|
||||
@ -1213,12 +1223,13 @@ int qdev_prop_check_globals(void)
|
||||
|
||||
void qdev_prop_set_globals(DeviceState *dev)
|
||||
{
|
||||
GList *l;
|
||||
int i;
|
||||
|
||||
for (l = global_props; l; l = l->next) {
|
||||
GlobalProperty *prop = l->data;
|
||||
for (i = 0; i < global_props()->len; i++) {
|
||||
GlobalProperty *prop;
|
||||
Error *err = NULL;
|
||||
|
||||
prop = g_ptr_array_index(global_props(), i);
|
||||
if (object_dynamic_cast(OBJECT(dev), prop->driver) == NULL) {
|
||||
continue;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user