Commit 99a0b036 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Andreas Färber
Browse files

qdev: Set globals in instance_post_init function 



This way, properties registered in the instance_init function of
child classes will be handled properly by qdev_prop_set_globals(), too.

Includes a unit test for the new functionality.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 8231c2dd

hw/core/qdev.c

+10 −1
Original line number Diff line number Diff line
@@ -752,7 +752,6 @@ static void device_initfn(Object *obj) 
        }

        class = object_class_get_parent(class);

    } while (class != object_class_by_name(TYPE_DEVICE));

    qdev_prop_set_globals(dev, &err);

    if (err != NULL) {

        qerror_report_err(err);

        error_free(err);
@@ -764,6 +763,15 @@ static void device_initfn(Object *obj) 
    assert_no_error(err);

}



static void device_post_init(Object *obj)

{

    DeviceState *dev = DEVICE(obj);

    Error *err = NULL;



    qdev_prop_set_globals(dev, &err);

    assert_no_error(err);

}



/* Unlink device from bus and free the structure.  */

static void device_finalize(Object *obj)

{
@@ -853,6 +861,7 @@ static const TypeInfo device_type_info = { 
    .parent = TYPE_OBJECT,

    .instance_size = sizeof(DeviceState),

    .instance_init = device_initfn,

    .instance_post_init = device_post_init,

    .instance_finalize = device_finalize,

    .class_base_init = device_class_base_init,

    .class_init = device_class_init,

tests/test-qdev-global-props.c

+73 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <stdint.h>



#include "hw/qdev.h"

#include "qom/object.h"

#include "qapi/visitor.h"





#define TYPE_STATIC_PROPS "static_prop_type"
@@ -91,15 +93,86 @@ static void test_static_globalprop(void) 
    g_assert_cmpuint(mt->prop2, ==, PROP_DEFAULT);

}



#define TYPE_DYNAMIC_PROPS "dynamic-prop-type"

#define DYNAMIC_TYPE(obj) \

    OBJECT_CHECK(MyType, (obj), TYPE_DYNAMIC_PROPS)



static void prop1_accessor(Object *obj,

                           Visitor *v,

                           void *opaque,

                           const char *name,

                           Error **errp)

{

    MyType *mt = DYNAMIC_TYPE(obj);



    visit_type_uint32(v, &mt->prop1, name, errp);

}



static void prop2_accessor(Object *obj,

                           Visitor *v,

                           void *opaque,

                           const char *name,

                           Error **errp)

{

    MyType *mt = DYNAMIC_TYPE(obj);



    visit_type_uint32(v, &mt->prop2, name, errp);

}



static void dynamic_instance_init(Object *obj)

{

    object_property_add(obj, "prop1", "uint32", prop1_accessor, prop1_accessor,

                        NULL, NULL, NULL);

    object_property_add(obj, "prop2", "uint32", prop2_accessor, prop2_accessor,

                        NULL, NULL, NULL);

}



static void dynamic_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = NULL;

}





static const TypeInfo dynamic_prop_type = {

    .name = TYPE_DYNAMIC_PROPS,

    .parent = TYPE_DEVICE,

    .instance_size = sizeof(MyType),

    .instance_init = dynamic_instance_init,

    .class_init = dynamic_class_init,

};



/* Test setting of static property using global properties */

static void test_dynamic_globalprop(void)

{

    MyType *mt;

    static GlobalProperty props[] = {

        { TYPE_DYNAMIC_PROPS, "prop1", "101" },

        { TYPE_DYNAMIC_PROPS, "prop2", "102" },

        {}

    };



    qdev_prop_register_global_list(props);



    mt = DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS));

    qdev_init_nofail(DEVICE(mt));



    g_assert_cmpuint(mt->prop1, ==, 101);

    g_assert_cmpuint(mt->prop2, ==, 102);

}



int main(int argc, char **argv)

{

    g_test_init(&argc, &argv, NULL);



    module_call_init(MODULE_INIT_QOM);

    type_register_static(&static_prop_type);

    type_register_static(&dynamic_prop_type);



    g_test_add_func("/qdev/properties/static/default", test_static_prop);

    g_test_add_func("/qdev/properties/static/global", test_static_globalprop);

    g_test_add_func("/qdev/properties/dynamic/global", test_dynamic_globalprop);



    g_test_run();