Commit 1c3994f6 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

qdev: make a separate helper function to apply compat properties 



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

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Acked-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent a310e653

hw/core/qdev.c

+5 −1
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ static void device_initfn(Object *obj) 
    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)) {

        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);

    }

}



static void device_post_init(Object *obj)

{

    object_apply_compat_props(obj);

    qdev_prop_set_globals(DEVICE(obj));

}

include/hw/qdev-core.h

+2 −0
Original line number Diff line number Diff line
@@ -422,6 +422,8 @@ const char *qdev_fw_name(DeviceState *dev); 


Object *qdev_get_machine(void);



void object_apply_compat_props(Object *obj);



/* FIXME: make this a link<> */

void qdev_set_parent_bus(DeviceState *dev, BusState *bus);