[libvirt] [PATCH 3/3] qemu: Drop redundant version checks
We require QEMU 1.5.0 these days, so checking for versions
older than that is pointless.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 499befb2cf..96a65046ba 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1724,10 +1724,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
*
* ref405ep: no pci
* taihu: no pci
- * bamboo: 1.1.0
+ * bamboo: 1.1.0 (<= 1.5.0, so basically forever)
* mac99: 2.0.0
* g3beige: 2.0.0
- * prep: 1.4.0
+ * prep: 1.4.0 (<= 1.5.0, so basically forever)
* pseries: 2.0.0
* mpc8544ds: forever
* virtex-m507: no pci
@@ -1749,16 +1749,11 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
STREQ(def->os.machine, "ppce500"))
return true;
- if (qemuCaps->version >= 1004000 &&
- STREQ(def->os.machine, "prep"))
- return true;
-
- if (qemuCaps->version >= 1001000 &&
- STREQ(def->os.machine, "bamboo"))
- return true;
-
- if (STREQ(def->os.machine, "mpc8544ds"))
+ if (STREQ(def->os.machine, "bamboo") ||
+ STREQ(def->os.machine, "mpc8544ds") ||
+ STREQ(def->os.machine, "prep")) {
return true;
+ }
return false;
}
--
2.17.1