From: Laine Stump <laine@redhat.com>
Date: Wed, 20 Oct 2021 18:54:31 +0000 (-0400)
Subject: Revert "qemuValidateDomainDefPCIFeature: Fix validation logic"
X-Git-Tag: v7.9.0-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aa75c3e4b35af7da598839f6cc38033965bc5ea;p=thirdparty%2Flibvirt.git

Revert "qemuValidateDomainDefPCIFeature: Fix validation logic"

This reverts commit bdc3e8f47be108fa552b72a6d913528869e61097.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
---

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 1ffc261c58..d3b9691db5 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -179,6 +179,9 @@ qemuValidateDomainDefPCIFeature(const virDomainDef *def,
                                 int feature)
 {
     size_t i;
+    bool q35Dom = qemuDomainIsQ35(def);
+    bool q35cap = q35Dom && virQEMUCapsGet(qemuCaps,
+                                           QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE);
 
     if (def->features[feature] == VIR_TRISTATE_SWITCH_ABSENT)
         return 0;
@@ -195,9 +198,9 @@ qemuValidateDomainDefPCIFeature(const virDomainDef *def,
                                    virArchToString(def->os.arch));
                     return -1;
                 }
-
-                if ((qemuDomainIsQ35(def) && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE)) ||
-                    (!qemuDomainIsQ35(def) && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE))) {
+                if (!q35cap &&
+                    !virQEMUCapsGet(qemuCaps,
+                                    QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE)) {
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                                    _("acpi-bridge-hotplug is not available with this QEMU binary"));
                     return -1;