From patchwork Tue Mar 11 15:35:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 329134 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 958AA2C00A4 for ; Wed, 12 Mar 2014 02:36:28 +1100 (EST) Received: from localhost ([::1]:55845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNOjC-0005Sa-Cj for incoming@patchwork.ozlabs.org; Tue, 11 Mar 2014 11:36:26 -0400 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 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2BFZli6016993 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 11 Mar 2014 11:35:47 -0400 Received: from localhost.localdomain.com (vpn1-6-194.ams2.redhat.com [10.36.6.194]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2BFZXdr012273; Tue, 11 Mar 2014 11:35:43 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 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 Subject: [Qemu-devel] [PATCH 3/3] tests/qdev-global-props: Manually add an instance of a QOM machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);