This reverts commit da896d440c7267e0b4575e4a3f2780bebf3fbfca.

Signed-off-by: Laine Stump <laine@redhat.com>
---
 ...i-hotplug-bridge-disable.x86_64-latest.xml | 36 -------------
 .../pc-i440fx-acpi-hotplug-bridge-disable.xml |  1 +
 ...pi-hotplug-bridge-enable.x86_64-latest.xml | 36 -------------
 .../pc-i440fx-acpi-hotplug-bridge-enable.xml  |  1 +
 ...cpi-root-hotplug-disable.x86_64-latest.xml | 33 ------------
 .../pc-i440fx-acpi-root-hotplug-disable.xml   |  1 +
 ...acpi-root-hotplug-enable.x86_64-latest.xml | 33 ------------
 .../pc-i440fx-acpi-root-hotplug-enable.xml    |  1 +
 ...i-hotplug-bridge-disable.x86_64-latest.xml | 53 -------------------
 .../q35-acpi-hotplug-bridge-disable.xml       |  1 +
 ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 -------------------
 .../q35-acpi-hotplug-bridge-enable.xml        |  1 +
 tests/qemuxml2xmltest.c                       | 24 ++++++---
 13 files changed, 24 insertions(+), 250 deletions(-)
 delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
 delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
 delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
 delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml
 delete mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
 delete mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml

diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml
deleted file mode 100644
index 1b63ff9539..0000000000
--- a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='qemu'>
-  <name>i440fx</name>
-  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <features>
-    <pci>
-      <acpi-bridge-hotplug state='off'/>
-    </pci>
-  </features>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
new file mode 120000
index 0000000000..8154897401
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml
deleted file mode 100644
index f7b2cbb9ce..0000000000
--- a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='qemu'>
-  <name>i440fx</name>
-  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <features>
-    <pci>
-      <acpi-bridge-hotplug state='on'/>
-    </pci>
-  </features>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
new file mode 120000
index 0000000000..6b9e5492f8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
deleted file mode 100644
index 5a78fe638d..0000000000
--- a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<domain type='qemu'>
-  <name>i440fx</name>
-  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='pci' index='0' model='pci-root'>
-      <target hotplug='off'/>
-    </controller>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
new file mode 120000
index 0000000000..0570e40273
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
deleted file mode 100644
index 002bfea99d..0000000000
--- a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<domain type='qemu'>
-  <name>i440fx</name>
-  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='pci' index='0' model='pci-root'>
-      <target hotplug='on'/>
-    </controller>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml
new file mode 120000
index 0000000000..2b0e42925f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml b/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml
deleted file mode 100644
index 87e61763fe..0000000000
--- a/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type='qemu'>
-  <name>q35</name>
-  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc-q35-2.5'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <features>
-    <pci>
-      <acpi-bridge-hotplug state='off'/>
-    </pci>
-  </features>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='dmi-to-pci-bridge'>
-      <model name='i82801b11-bridge'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/>
-    </controller>
-    <controller type='pci' index='2' model='pci-bridge'>
-      <model name='pci-bridge'/>
-      <target chassisNr='2'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='ioh3420'/>
-      <target chassis='3' port='0x8'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </controller>
-    <controller type='usb' index='0' model='qemu-xhci'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml b/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
new file mode 120000
index 0000000000..77719b1325
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml b/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml
deleted file mode 100644
index 9a8043849c..0000000000
--- a/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type='qemu'>
-  <name>q35</name>
-  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc-q35-2.5'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <features>
-    <pci>
-      <acpi-bridge-hotplug state='on'/>
-    </pci>
-  </features>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='dmi-to-pci-bridge'>
-      <model name='i82801b11-bridge'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/>
-    </controller>
-    <controller type='pci' index='2' model='pci-bridge'>
-      <model name='pci-bridge'/>
-      <target chassisNr='2'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='ioh3420'/>
-      <target chassis='3' port='0x8'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </controller>
-    <controller type='usb' index='0' model='qemu-xhci'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml b/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml
new file mode 120000
index 0000000000..3cd8ee569e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index b0a1212a54..d6effbdac6 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -424,12 +424,24 @@ mymain(void)
     DO_TEST_NOCAPS("input-usbtablet");
     DO_TEST_NOCAPS("misc-acpi");
     DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
-    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
-    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
-    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable");
-    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-enable");
-    DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-disable");
-    DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-enable");
+    DO_TEST("pc-i440fx-acpi-root-hotplug-disable",
+            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);
+    DO_TEST("pc-i440fx-acpi-root-hotplug-enable",
+            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);
+    DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable",
+            QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("pc-i440fx-acpi-hotplug-bridge-enable",
+            QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("q35-acpi-hotplug-bridge-disable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+            QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("q35-acpi-hotplug-bridge-enable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+            QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE);
     DO_TEST("misc-disable-suspends",
             QEMU_CAPS_PIIX_DISABLE_S3,
             QEMU_CAPS_PIIX_DISABLE_S4);
-- 
2.31.1

On a Thursday in 2021, Laine Stump wrote:
>This reverts commit da896d440c7267e0b4575e4a3f2780bebf3fbfca.
>
>Signed-off-by: Laine Stump <laine@redhat.com>
>---
> ...i-hotplug-bridge-disable.x86_64-latest.xml | 36 -------------
> .../pc-i440fx-acpi-hotplug-bridge-disable.xml |  1 +
> ...pi-hotplug-bridge-enable.x86_64-latest.xml | 36 -------------
> .../pc-i440fx-acpi-hotplug-bridge-enable.xml  |  1 +
> ...cpi-root-hotplug-disable.x86_64-latest.xml | 33 ------------
> .../pc-i440fx-acpi-root-hotplug-disable.xml   |  1 +
> ...acpi-root-hotplug-enable.x86_64-latest.xml | 33 ------------
> .../pc-i440fx-acpi-root-hotplug-enable.xml    |  1 +
> ...i-hotplug-bridge-disable.x86_64-latest.xml | 53 -------------------
> .../q35-acpi-hotplug-bridge-disable.xml       |  1 +
> ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 -------------------
> .../q35-acpi-hotplug-bridge-enable.xml        |  1 +
> tests/qemuxml2xmltest.c                       | 24 ++++++---
> 13 files changed, 24 insertions(+), 250 deletions(-)
> delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml
> create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
> delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml
> create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
> delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
> create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
> delete mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
> create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml
> delete mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml
> create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
> delete mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml
> create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml
>
>diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
>index b0a1212a54..d6effbdac6 100644
>--- a/tests/qemuxml2xmltest.c
>+++ b/tests/qemuxml2xmltest.c
>@@ -424,12 +424,24 @@ mymain(void)
>     DO_TEST_NOCAPS("input-usbtablet");
>     DO_TEST_NOCAPS("misc-acpi");
>     DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
>-    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
>-    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
>-    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable");
>-    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-enable");
>-    DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-disable");
>-    DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-enable");
>+    DO_TEST("pc-i440fx-acpi-root-hotplug-disable",
>+            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);
>+    DO_TEST("pc-i440fx-acpi-root-hotplug-enable",
>+            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);

Please only do a partial revert here and leave the i440fx root hotplug
tests using the _LATEST form, since you're only reverting bridge hotplug
tests by the end of the series.

(The only conflict will be in context in the second-to-last patch.
  Well, and the NEWS addition, because I pushed a patch there in the
  meantime)

Jano

>+    DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable",
>+            QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);
>+    DO_TEST("pc-i440fx-acpi-hotplug-bridge-enable",
>+            QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);

On 10/21/21 1:06 PM, Ján Tomko wrote:
> On a Thursday in 2021, Laine Stump wrote:
>> This reverts commit da896d440c7267e0b4575e4a3f2780bebf3fbfca.
>>
>> Signed-off-by: Laine Stump <laine@redhat.com>
>> ---
>> ...i-hotplug-bridge-disable.x86_64-latest.xml | 36 -------------
>> .../pc-i440fx-acpi-hotplug-bridge-disable.xml |  1 +
>> ...pi-hotplug-bridge-enable.x86_64-latest.xml | 36 -------------
>> .../pc-i440fx-acpi-hotplug-bridge-enable.xml  |  1 +
>> ...cpi-root-hotplug-disable.x86_64-latest.xml | 33 ------------
>> .../pc-i440fx-acpi-root-hotplug-disable.xml   |  1 +
>> ...acpi-root-hotplug-enable.x86_64-latest.xml | 33 ------------
>> .../pc-i440fx-acpi-root-hotplug-enable.xml    |  1 +
>> ...i-hotplug-bridge-disable.x86_64-latest.xml | 53 -------------------
>> .../q35-acpi-hotplug-bridge-disable.xml       |  1 +
>> ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 -------------------
>> .../q35-acpi-hotplug-bridge-enable.xml        |  1 +
>> tests/qemuxml2xmltest.c                       | 24 ++++++---
>> 13 files changed, 24 insertions(+), 250 deletions(-)
>> delete mode 100644 
>> tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml 
>>
>> create mode 120000 
>> tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
>> delete mode 100644 
>> tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml 
>>
>> create mode 120000 
>> tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
>> delete mode 100644 
>> tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml 
>>
>> create mode 120000 
>> tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
>> delete mode 100644 
>> tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml 
>>
>> create mode 120000 
>> tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml
>> delete mode 100644 
>> tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml 
>>
>> create mode 120000 
>> tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
>> delete mode 100644 
>> tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml
>> create mode 120000 
>> tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml
>>
>> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
>> index b0a1212a54..d6effbdac6 100644
>> --- a/tests/qemuxml2xmltest.c
>> +++ b/tests/qemuxml2xmltest.c
>> @@ -424,12 +424,24 @@ mymain(void)
>>     DO_TEST_NOCAPS("input-usbtablet");
>>     DO_TEST_NOCAPS("misc-acpi");
>>     DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
>> -    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
>> -    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
>> -    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable");
>> -    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-enable");
>> -    DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-disable");
>> -    DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-enable");
>> +    DO_TEST("pc-i440fx-acpi-root-hotplug-disable",
>> +            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);
>> +    DO_TEST("pc-i440fx-acpi-root-hotplug-enable",
>> +            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);
> 
> Please only do a partial revert here and leave the i440fx root hotplug
> tests using the _LATEST form, since you're only reverting bridge hotplug
> tests by the end of the series.

Huh, I thought I caught all of those (maybe I "re-un-re-reverted" it in 
another patch?). Thanks for catching it!

I fixed it, but I'm waiting until Monday to push these.

> 
> (The only conflict will be in context in the second-to-last patch.
>   Well, and the NEWS addition, because I pushed a patch there in the
>   meantime)
> 
> Jano
> 
>> +    DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable",
>> +            QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);
>> +    DO_TEST("pc-i440fx-acpi-hotplug-bridge-enable",
>> +            QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);

On Sat, 23 Oct 2021, Laine Stump wrote:

> On 10/21/21 1:06 PM, Ján Tomko wrote:
> > On a Thursday in 2021, Laine Stump wrote:
> > > This reverts commit da896d440c7267e0b4575e4a3f2780bebf3fbfca.
> > >
> > > Signed-off-by: Laine Stump <laine@redhat.com>
> > > ---
> > > ...i-hotplug-bridge-disable.x86_64-latest.xml | 36 -------------
> > > .../pc-i440fx-acpi-hotplug-bridge-disable.xml |  1 +
> > > ...pi-hotplug-bridge-enable.x86_64-latest.xml | 36 -------------
> > > .../pc-i440fx-acpi-hotplug-bridge-enable.xml  |  1 +
> > > ...cpi-root-hotplug-disable.x86_64-latest.xml | 33 ------------
> > > .../pc-i440fx-acpi-root-hotplug-disable.xml   |  1 +
> > > ...acpi-root-hotplug-enable.x86_64-latest.xml | 33 ------------
> > > .../pc-i440fx-acpi-root-hotplug-enable.xml    |  1 +
> > > ...i-hotplug-bridge-disable.x86_64-latest.xml | 53 -------------------
> > > .../q35-acpi-hotplug-bridge-disable.xml       |  1 +
> > > ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 -------------------
> > > .../q35-acpi-hotplug-bridge-enable.xml        |  1 +
> > > tests/qemuxml2xmltest.c                       | 24 ++++++---
> > > 13 files changed, 24 insertions(+), 250 deletions(-)
> > > delete mode 100644
> > > tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml
> > > create mode 120000
> > > tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
> > > delete mode 100644
> > > tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml
> > > create mode 120000
> > > tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
> > > delete mode 100644
> > > tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml
> > > create mode 120000
> > > tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
> > > delete mode 100644
> > > tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml
> > > create mode 120000
> > > tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml
> > > delete mode 100644
> > > tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml
> > > create mode 120000
> > > tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
> > > delete mode 100644
> > > tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml
> > > create mode 120000
> > > tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml
> > >
> > > diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
> > > index b0a1212a54..d6effbdac6 100644
> > > --- a/tests/qemuxml2xmltest.c
> > > +++ b/tests/qemuxml2xmltest.c
> > > @@ -424,12 +424,24 @@ mymain(void)
> > >     DO_TEST_NOCAPS("input-usbtablet");
> > >     DO_TEST_NOCAPS("misc-acpi");
> > >     DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
> > > -    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
> > > -    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
> > > -    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable");
> > > -    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-enable");
> > > -    DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-disable");
> > > -    DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-enable");
> > > +    DO_TEST("pc-i440fx-acpi-root-hotplug-disable",
> > > +            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);
> > > +    DO_TEST("pc-i440fx-acpi-root-hotplug-enable",
> > > +            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);
> >
> > Please only do a partial revert here and leave the i440fx root hotplug
> > tests using the _LATEST form, since you're only reverting bridge hotplug
> > tests by the end of the series.
>
> Huh, I thought I caught all of those (maybe I "re-un-re-reverted" it in
> another patch?). Thanks for catching it!
>
> I fixed it, but I'm waiting until Monday to push these.

Please also review and push two simple patches related to pci-root hotplug
that I sent. Hopefully they can make it in before the release.

After you revert, I will also need to make another pass through my
changes in case something was missed.

>
> >
> > (The only conflict will be in context in the second-to-last patch.
> >   Well, and the NEWS addition, because I pushed a patch there in the
> >   meantime)
> >
> > Jano
> >
> > > +    DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable",
> > > +            QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);
> > > +    DO_TEST("pc-i440fx-acpi-hotplug-bridge-enable",
> > > +            QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);
>
>