On Wed, 10 Jul 2013 17:08:42 -0300
Eduardo Habkost <ehabk...@redhat.com> wrote:
> This way, properties registered in the instance_init() function of
> children classes will be handled properly by qdev_prop_set_globals(),
> too.
>
> Includes a new unit test for the new functionality.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> hw/core/qdev.c | 10 +++++-
> tests/test-qdev-global-props.c | 71
> +++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 79 insertions(+), 2 deletions(-)
>
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 9190a7e..e0acb6c 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -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,14 @@ static void device_initfn(Object *obj)
> assert_no_error(err);
> }
>
> +static void device_post_init(Object *obj)
> +{
> + Error *err = NULL;
> + DeviceState *dev = DEVICE(obj);
> + 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 +860,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,
> diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c
> index 4c50156..7b5eb88 100644
> --- a/tests/test-qdev-global-props.c
> +++ b/tests/test-qdev-global-props.c
> @@ -26,6 +26,8 @@
> #include <stdint.h>
>
> #include "hw/qdev.h"
> +#include "qemu/object.h"
> +#include "qapi-visit.h"
>
>
> #define TYPE_STATIC_PROPS "static_prop_type"
> @@ -80,7 +82,7 @@ static void test_static_prop(void)
> static void test_static_globalprop(void)
> {
> MyType *mt;
> - GlobalProperty props[] = {
> + static GlobalProperty props[] = {
> {TYPE_STATIC_PROPS, "prop1", "200"},
> {}
> };
hunk belongs to the 1st patch?
> @@ -93,15 +95,82 @@ 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_acessor(Object *obj,
> + struct Visitor *v,
> + void *opaque,
> + const char *name,
> + struct Error **errp)
> +{
> + MyType *mt = DYNAMIC_TYPE(obj);
> + visit_type_uint32(v, &mt->prop1, name, errp);
> +}
> +
> +static void prop2_acessor(Object *obj,
> + struct Visitor *v,
> + void *opaque,
> + const char *name,
> + struct 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_acessor, prop1_acessor,
> + NULL, NULL, NULL);
> + object_property_add(obj, "prop2", "uint32", prop2_acessor, prop2_acessor,
> + NULL, NULL, NULL);
> +}
> +
> +static void dynamic_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + dc->init = mytype_init;
> +}
> +
> +
> +static 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"},
> + {}
> + };
this list cloud be the same for static and dynamic tests, no need to duplicate
and perhaps one property is enough, like it's done for static one?
> + 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)
> {
> module_call_init(MODULE_INIT_QOM);
> type_register_static(&static_prop_type);
> + type_register_static(&dynamic_prop_type);
>
> g_test_init(&argc, &argv, NULL);
>
> 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();
>
