qemu: Stop checking QEMU_CAPS_OBJECT_GPEX

For all versions of QEMU that we support, the virt machine type
has a hard dependency on this device, so we can stop checking
whether the capability is present and just use it unconditionally.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e2a1bf2c1304226a27aeaef05be678bf6ce42c28..7c87cd6453e25e216eeee6752dbd3ac05afc60e7 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4168,7 +4168,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
         addDefaultUSB = false;
         addDefaultMemballoon = false;
         if (qemuDomainIsARMVirt(def))
-            addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX);
+            addPCIeRoot = true;
         break;
 
     case VIR_ARCH_PPC64:
@@ -4195,7 +4195,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
     case VIR_ARCH_RISCV64:
         addDefaultUSB = false;
         if (qemuDomainIsRISCVVirt(def))
-            addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX);
+            addPCIeRoot = true;
         break;
 
     case VIR_ARCH_S390:
@@ -9059,8 +9059,7 @@ qemuDomainNeedsFDC(const virDomainDef *def)
 
 
 bool
-qemuDomainSupportsPCI(virDomainDef *def,
-                      virQEMUCaps *qemuCaps)
+qemuDomainSupportsPCI(virDomainDef *def)
 {
     if (def->os.arch != VIR_ARCH_ARMV6L &&
         def->os.arch != VIR_ARCH_ARMV7L &&
@@ -9072,9 +9071,8 @@ qemuDomainSupportsPCI(virDomainDef *def,
     if (STREQ(def->os.machine, "versatilepb"))
         return true;
 
-    if ((qemuDomainIsARMVirt(def) ||
-         qemuDomainIsRISCVVirt(def)) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX)) {
+    if (qemuDomainIsARMVirt(def) ||
+        qemuDomainIsRISCVVirt(def)) {
         return true;
     }
 

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index fa566dded657c3c3b58adbc70dfd76ae77b5f27c..b0f1587f58710d48944e6009573f5243ad2c38a3 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -834,8 +834,7 @@ bool qemuDomainHasPCIeRoot(const virDomainDef *def);
 bool qemuDomainHasBuiltinIDE(const virDomainDef *def);
 bool qemuDomainHasBuiltinESP(const virDomainDef *def);
 bool qemuDomainNeedsFDC(const virDomainDef *def);
-bool qemuDomainSupportsPCI(virDomainDef *def,
-                           virQEMUCaps *qemuCaps);
+bool qemuDomainSupportsPCI(virDomainDef *def);
 
 void qemuDomainUpdateCurrentMemorySize(virDomainObj *vm);
 

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 979bc8a9fdfd90bb868108bf5d1aace1eaf14cd4..413f152230933c5f687d318215f7b1614d7d1d9a 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -2849,7 +2849,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def,
     if (!(addrs = qemuDomainPCIAddressSetCreate(def, qemuCaps, nbuses, false)))
         goto cleanup;
 
-    if (qemuDomainSupportsPCI(def, qemuCaps)) {
+    if (qemuDomainSupportsPCI(def)) {
         if (qemuDomainValidateDevicePCISlotsChipsets(def, addrs) < 0)
             goto cleanup;