From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8zeA-0005qB-Ct for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8ze9-00050Q-G8 for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c8ze9-0004zi-Am for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:17 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7680CC057FAD for ; Tue, 22 Nov 2016 01:13:16 +0000 (UTC) From: Eduardo Habkost Date: Mon, 21 Nov 2016 23:12:09 -0200 Message-Id: <1479777133-23567-12-git-send-email-ehabkost@redhat.com> In-Reply-To: <1479777133-23567-1-git-send-email-ehabkost@redhat.com> References: <1479777133-23567-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 11/15] s390x: Initialize default bus lists List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" Populate the default_bus_types list for the s390x machines. This will allow qmp-machine-info.py to run in strict mode for s390x. Signed-off-by: Eduardo Habkost --- hw/s390x/s390-virtio-ccw.c | 6 ++++++ tests/qmp-machine-info.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e340eab..2532fcb 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -206,6 +206,12 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->use_sclp = 1; mc->max_cpus = 248; mc->get_hotplug_handler = s390_get_hotplug_handler; + machine_class_add_default_bus(mc, TYPE_VIRTUAL_CSS_BUS); + machine_class_add_default_bus(mc, TYPE_PCI_BUS); + machine_class_add_default_bus(mc, TYPE_S390_PCI_BUS); + machine_class_add_default_bus(mc, "s390-sclp-events-bus"); + machine_class_add_default_bus(mc, TYPE_VIRTIO_BUS); + hc->plug = s390_machine_device_plug; nc->nmi_monitor_handler = s390_nmi; } diff --git a/tests/qmp-machine-info.py b/tests/qmp-machine-info.py index a43cd1b..e6a6b76 100755 --- a/tests/qmp-machine-info.py +++ b/tests/qmp-machine-info.py @@ -12,7 +12,7 @@ logger = logging.getLogger('qemu.tests.machineinfo') BLACKLIST = set(['xenpv', 'xenfv']) # architectures where machines are expected to report all available buses: -STRICT_ARCHES = set(['x86_64', 'i386']) +STRICT_ARCHES = set(['x86_64', 'i386', 's390x']) class QueryMachinesTest(unittest.TestCase): def walkQOMTree(self, vm, path): -- 2.7.4