[libvirt PATCH 02/10] Revert "qemuxml2xmltest: Convert all acpi-hotplug control related tests to DO_TEST_CAPS_LATEST"

[Ján Tomko]

On a Thursday in 2021, Laine Stump wrote:
>This reverts commit da896d440c7267e0b4575e4a3f2780bebf3fbfca.
>
>Signed-off-by: Laine Stump <laine at 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);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20211021/5ad1d6b0/attachment-0001.sig>