From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VANKm-0002ha-2r for qemu-devel@nongnu.org; Fri, 16 Aug 2013 12:57:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VANKg-0000d0-0h for qemu-devel@nongnu.org; Fri, 16 Aug 2013 12:57:08 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55460 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VANKf-0000cZ-Nh for qemu-devel@nongnu.org; Fri, 16 Aug 2013 12:57:01 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 16 Aug 2013 18:56:41 +0200 Message-Id: <1376672203-31191-5-git-send-email-afaerber@suse.de> In-Reply-To: <1376672203-31191-1-git-send-email-afaerber@suse.de> References: <1376672203-31191-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 4/6] qdev: Set globals in instance_post_init function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost 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: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber --- hw/core/qdev.c | 11 ++++++- tests/test-qdev-global-props.c | 73 ++++++++++++++++++++++++++++++++++++= ++++++ 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 9190a7e..758de9f 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -752,7 +752,6 @@ static void device_initfn(Object *obj) } class =3D object_class_get_parent(class); } while (class !=3D object_class_by_name(TYPE_DEVICE)); - qdev_prop_set_globals(dev, &err); if (err !=3D NULL) { qerror_report_err(err); error_free(err); @@ -764,6 +763,15 @@ static void device_initfn(Object *obj) assert_no_error(err); } =20 +static void device_post_init(Object *obj) +{ + DeviceState *dev =3D DEVICE(obj); + Error *err =3D 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 =3D { .parent =3D TYPE_OBJECT, .instance_size =3D sizeof(DeviceState), .instance_init =3D device_initfn, + .instance_post_init =3D device_post_init, .instance_finalize =3D device_finalize, .class_base_init =3D device_class_base_init, .class_init =3D device_class_init, diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-prop= s.c index 08dfc87..e4ad173 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -26,6 +26,8 @@ #include =20 #include "hw/qdev.h" +#include "qom/object.h" +#include "qapi/visitor.h" =20 =20 #define TYPE_STATIC_PROPS "static_prop_type" @@ -91,15 +93,86 @@ static void test_static_globalprop(void) g_assert_cmpuint(mt->prop2, =3D=3D, PROP_DEFAULT); } =20 +#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 =3D 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 =3D 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_ac= cessor, + NULL, NULL, NULL); + object_property_add(obj, "prop2", "uint32", prop2_accessor, prop2_ac= cessor, + NULL, NULL, NULL); +} + +static void dynamic_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + dc->realize =3D NULL; +} + + +static const TypeInfo dynamic_prop_type =3D { + .name =3D TYPE_DYNAMIC_PROPS, + .parent =3D TYPE_DEVICE, + .instance_size =3D sizeof(MyType), + .instance_init =3D dynamic_instance_init, + .class_init =3D dynamic_class_init, +}; + +/* Test setting of static property using global properties */ +static void test_dynamic_globalprop(void) +{ + MyType *mt; + static GlobalProperty props[] =3D { + { TYPE_DYNAMIC_PROPS, "prop1", "101" }, + { TYPE_DYNAMIC_PROPS, "prop2", "102" }, + {} + }; + + qdev_prop_register_global_list(props); + + mt =3D DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS)); + qdev_init_nofail(DEVICE(mt)); + + g_assert_cmpuint(mt->prop1, =3D=3D, 101); + g_assert_cmpuint(mt->prop2, =3D=3D, 102); +} + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 module_call_init(MODULE_INIT_QOM); type_register_static(&static_prop_type); + type_register_static(&dynamic_prop_type); =20 g_test_add_func("/qdev/properties/static/default", test_static_prop)= ; g_test_add_func("/qdev/properties/static/global", test_static_global= prop); + g_test_add_func("/qdev/properties/dynamic/global", test_dynamic_glob= alprop); =20 g_test_run(); =20 --=20 1.8.1.4