[Qemu-devel] [RFC 11/15] s390x: Initialize default bus lists

[Eduardo Habkost]

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 <address@hidden>
---
 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