QEMU on s390 supports PCI multibus since forever. But zPCI, as extension
of PCI device on s390, is the significant capability. Only when zPCI
capability is existing, we consider QEMU supports PCI multibus properly.
So let enable PCI multibus only if zPCI is supported.
Signed-off-by: Yi Min Zhao <zyimin(a)linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com>
Reviewed-by: Stefan Zimmermann <stzi(a)linux.ibm.com>
Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com>
---
src/qemu/qemu_capabilities.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 07f58fd014..7cba7eecdc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1760,6 +1760,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
return false;
}
+ /* S390 supports PCI-multibus. */
+ if (ARCH_IS_S390(def->os.arch))
+ return true;
+
/* If 'virt' supports PCI, it supports multibus.
* No extra conditions here for simplicity.
*/
--
Yi Min