From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUgnb-0002Q9-0a for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:51:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUgnU-0006JQ-MH for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:51:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUgnU-0006IS-Ez for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:51:16 -0400 Date: Thu, 18 Sep 2014 21:54:29 +0300 From: "Michael S. Tsirkin" Message-ID: <1411066387-30889-7-git-send-email-mst@redhat.com> References: <1411066387-30889-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1411066387-30889-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v3 06/15] test-qdev-global-props: Test handling of hotpluggable and non-device types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Don Slutz , Eduardo Habkost , Anthony Liguori From: Eduardo Habkost Ensure no warning will be printed for hotpluggable types, and warnings will be printed for non-device types. Signed-off-by: Eduardo Habkost Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/test-qdev-global-props.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index 5488937..26d8cb2 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -113,6 +113,9 @@ static void test_static_globalprop(void) #define DYNAMIC_TYPE(obj) \ OBJECT_CHECK(MyType, (obj), TYPE_DYNAMIC_PROPS) +#define TYPE_UNUSED_HOTPLUG "hotplug-type" +#define TYPE_UNUSED_NOHOTPLUG "nohotplug-type" + static void prop1_accessor(Object *obj, Visitor *v, void *opaque, @@ -159,6 +162,45 @@ static const TypeInfo dynamic_prop_type = { .class_init = dynamic_class_init, }; +static void hotplug_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + + dc->realize = NULL; + dc->hotpluggable = true; +} + +static const TypeInfo hotplug_type = { + .name = TYPE_UNUSED_HOTPLUG, + .parent = TYPE_DEVICE, + .instance_size = sizeof(MyType), + .instance_init = dynamic_instance_init, + .class_init = hotplug_class_init, +}; + +static void nohotplug_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + + dc->realize = NULL; + dc->hotpluggable = false; +} + +static const TypeInfo nohotplug_type = { + .name = TYPE_UNUSED_NOHOTPLUG, + .parent = TYPE_DEVICE, + .instance_size = sizeof(MyType), + .instance_init = dynamic_instance_init, + .class_init = nohotplug_class_init, +}; + +#define TYPE_NONDEVICE "nondevice-type" + +static const TypeInfo nondevice_type = { + .name = TYPE_NONDEVICE, + .parent = TYPE_OBJECT, +}; + /* Test setting of dynamic properties using global properties */ static void test_dynamic_globalprop_subprocess(void) { @@ -167,6 +209,10 @@ static void test_dynamic_globalprop_subprocess(void) { TYPE_DYNAMIC_PROPS, "prop1", "101", true }, { TYPE_DYNAMIC_PROPS, "prop2", "102", true }, { TYPE_DYNAMIC_PROPS"-bad", "prop3", "103", true }, + /* .not_used=false to emulate what qdev_add_one_global() does: */ + { TYPE_UNUSED_HOTPLUG, "prop4", "104", false }, + { TYPE_UNUSED_NOHOTPLUG, "prop5", "105", true }, + { TYPE_NONDEVICE, "prop6", "106", true }, {} }; int all_used; @@ -183,6 +229,9 @@ static void test_dynamic_globalprop_subprocess(void) g_assert(!props[0].not_used); g_assert(!props[1].not_used); g_assert(props[2].not_used); + g_assert(!props[3].not_used); + g_assert(props[4].not_used); + g_assert(props[5].not_used); } static void test_dynamic_globalprop(void) @@ -192,6 +241,9 @@ static void test_dynamic_globalprop(void) g_test_trap_assert_stderr_unmatched("*prop1*"); g_test_trap_assert_stderr_unmatched("*prop2*"); g_test_trap_assert_stderr("*Warning: \"-global dynamic-prop-type-bad.prop3=103\" not used\n*"); + g_test_trap_assert_stderr_unmatched("*prop4*"); + g_test_trap_assert_stderr("*Warning: \"-global nohotplug-type.prop5=105\" not used\n*"); + g_test_trap_assert_stderr("*Warning: \"-global nondevice-type.prop6=106\" not used\n*"); g_test_trap_assert_stdout(""); } @@ -202,6 +254,9 @@ int main(int argc, char **argv) module_call_init(MODULE_INIT_QOM); type_register_static(&static_prop_type); type_register_static(&dynamic_prop_type); + type_register_static(&hotplug_type); + type_register_static(&nohotplug_type); + type_register_static(&nondevice_type); g_test_add_func("/qdev/properties/static/default/subprocess", test_static_prop_subprocess); -- MST