From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOih-0005Ic-Me for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:36:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNOib-0004XJ-Op for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:35:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOib-0004XF-G3 for qemu-devel@nongnu.org; Tue, 11 Mar 2014 11:35:49 -0400 From: Marcel Apfelbaum Date: Tue, 11 Mar 2014 17:35:56 +0200 Message-Id: <1394552156-18901-4-git-send-email-marcel.a@redhat.com> In-Reply-To: <1394552156-18901-1-git-send-email-marcel.a@redhat.com> References: <1394552156-18901-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] tests/qdev-global-props: Manually add an instance of a QOM machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, ehabkost@redhat.com, mst@redhat.com, stefanha@redhat.com, armbru@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de The machine is no longer a container. Add null-machine to the QOM tree. Signed-off-by: Marcel Apfelbaum --- tests/Makefile | 2 +- tests/test-qdev-global-props.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index b17d41e..b86446d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -182,7 +182,7 @@ tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o tests/test-int128$(EXESUF): tests/test-int128.o tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/qdev.o hw/core/qdev-properties.o hw/core/hotplug.o\ - hw/core/irq.o \ + hw/core/irq.o hw/core/machine.o hw/core/null-machine.o \ $(qom-core-obj) \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.a diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index e4ad173..964ae96 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -170,6 +170,9 @@ int main(int argc, char **argv) type_register_static(&static_prop_type); type_register_static(&dynamic_prop_type); + object_property_add_child(object_get_root(), "machine", + object_new("none-machine"), &error_abort); + 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); -- 1.8.3.1