mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdev: make a separate helper function to apply compat properties

Browse Source 
This will allow to apply compat properties on other objects than QDev easily.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-12-02 01:23:27 +04:00
parent a310e653ce
commit 1c3994f6d2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/core/qdev.c
View File

@ -970,7 +970,7 @@ static void device_initfn(Object *obj)
QLIST_INIT(&dev->gpios); QLIST_INIT(&dev->gpios);
} }
static void device_post_init(Object *obj) void object_apply_compat_props(Object *obj)
{ {
if (object_dynamic_cast(qdev_get_machine(), TYPE_MACHINE)) { if (object_dynamic_cast(qdev_get_machine(), TYPE_MACHINE)) {
MachineState *m = MACHINE(qdev_get_machine()); MachineState *m = MACHINE(qdev_get_machine());
@ -982,7 +982,11 @@ static void device_post_init(Object *obj)
} }
object_apply_global_props(obj, mc->compat_props, &error_abort); object_apply_global_props(obj, mc->compat_props, &error_abort);
} }
}
static void device_post_init(Object *obj)
{
object_apply_compat_props(obj);
qdev_prop_set_globals(DEVICE(obj)); qdev_prop_set_globals(DEVICE(obj));
} }

2
include/hw/qdev-core.h
View File

@ -422,6 +422,8 @@ const char *qdev_fw_name(DeviceState *dev);
Object *qdev_get_machine(void); Object *qdev_get_machine(void);
void object_apply_compat_props(Object *obj);
/* FIXME: make this a link<> */ /* FIXME: make this a link<> */
void qdev_set_parent_bus(DeviceState *dev, BusState *bus); void qdev_set_parent_bus(DeviceState *dev, BusState *bus);