render / rpms / libvirt

Forked from rpms/libvirt 9 months ago
Clone
c313de
From 2c4fb8fc19d1dd6ef8fafdfb1e48998020a368cd Mon Sep 17 00:00:00 2001
c313de
Message-Id: <2c4fb8fc19d1dd6ef8fafdfb1e48998020a368cd@dist-git>
c313de
From: Yi Min Zhao <zyimin@linux.ibm.com>
c313de
Date: Mon, 8 Apr 2019 10:57:20 +0200
c313de
Subject: [PATCH] qemu: Enable PCI multi bus for S390 guests
c313de
MIME-Version: 1.0
c313de
Content-Type: text/plain; charset=UTF-8
c313de
Content-Transfer-Encoding: 8bit
c313de
c313de
QEMU on s390 supports PCI multibus since forever.
c313de
c313de
Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
c313de
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
c313de
Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
c313de
Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
c313de
c313de
(cherry picked from commit f49a5e3bf4c275ddb8a60274d6ab941b2f99f553)
c313de
c313de
https://bugzilla.redhat.com/show_bug.cgi?id=1508149
c313de
c313de
Conflicts:
c313de
c313de
  * src/qemu/qemu_capabilities.c
c313de
    + context
c313de
      - missing fa95035bd4c9
c313de
c313de
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
c313de
Message-Id: <20190408085732.28684-4-abologna@redhat.com>
c313de
Reviewed-by: Laine Stump <laine@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
---
c313de
 src/qemu/qemu_capabilities.c | 4 ++++
c313de
 1 file changed, 4 insertions(+)
c313de
c313de
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
c313de
index 8ca53abf2b..5539d168cd 100644
c313de
--- a/src/qemu/qemu_capabilities.c
c313de
+++ b/src/qemu/qemu_capabilities.c
c313de
@@ -1803,6 +1803,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
c313de
         return false;
c313de
     }
c313de
 
c313de
+    /* S390 supports PCI-multibus. */
c313de
+    if (ARCH_IS_S390(def->os.arch))
c313de
+        return true;
c313de
+
c313de
     /* If 'virt' supports PCI, it supports multibus.
c313de
      * No extra conditions here for simplicity.
c313de
      */
c313de
-- 
c313de
2.22.0
c313de