[PATCH v2 4/7] qemuxml2argvtest: Use real-caps testing for 'acpi-hotplug-bridge-disable'

[Ján Tomko]

On a Monday in 2021, Peter Krempa wrote:
>We can use real example configs to prove the support without the
>need for using fake capabilities. Fix the recently added test cases.
>
>The negative case for 'pc-i440fx-acpi-hotplug-bridge-disable' is removed
>completely as there is no real qemu libvirt supports which wouldn't
>have the capability.
>
>Fixes: bef0f0d8be6
>Signed-off-by: Peter Krempa <pkrempa at redhat.com>
>---
> ...pi-hotplug-bridge-disable.aarch64-latest.err |  1 +
> .../aarch64-acpi-hotplug-bridge-disable.err     |  1 -
> ...i-hotplug-bridge-disable.x86_64-latest.args} | 15 +++++++++------
> .../q35-acpi-hotplug-bridge-disable.err         |  1 -
> ...cpi-hotplug-bridge-disable.x86_64-6.0.0.err} |  0
> ...i-hotplug-bridge-disable.x86_64-latest.args} | 14 +++++++++-----
> tests/qemuxml2argvtest.c                        | 17 ++++-------------
> 7 files changed, 23 insertions(+), 26 deletions(-)
> create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err
> delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err
> rename tests/qemuxml2argvdata/{pc-i440fx-acpi-hotplug-bridge-disable.args => pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.args} (55%)
> delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err
> rename tests/qemuxml2argvdata/{pc-i440fx-acpi-hotplug-bridge-disable.err => q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err} (100%)
> rename tests/qemuxml2argvdata/{q35-acpi-hotplug-bridge-disable.args => q35-acpi-hotplug-bridge-disable.x86_64-latest.args} (61%)
>
>diff --git a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err
>new file mode 100644
>index 0000000000..139591fce3
>--- /dev/null
>+++ b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err
>@@ -0,0 +1 @@
>+XML error: The PCI controller with index='0' must be model='pcie-root' for this machine type, but model='pci-root' was found instead

This error is suspicious.

Looks like we only validate that the PCI controller is model pcie-root
if QEMU_CAPS_OBJECT_GPEX is present.

The following fixes it for me, but I have not verified that the
definition does not contain other errors.

diff --git a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err
index 139591fce3..9f0a88b826 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err
+++ b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err
@@ -1 +1 @@
-XML error: The PCI controller with index='0' must be model='pcie-root' for this machine type, but model='pci-root' was found instead
+unsupported configuration: acpi-bridge-hotplug is not available for architecture 'aarch64'
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml
index 0d5f945bd7..757f7a6776 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml
+++ b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml
@@ -22,7 +22,7 @@
      <controller type='usb' index='0'>
        <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
      </controller>
-    <controller type='pci' index='0' model='pci-root'/>
+    <controller type='pci' index='0' model='pcie-root'/>
      <input type='mouse' bus='ps2'/>
      <input type='keyboard' bus='ps2'/>
      <audio id='1' type='none'/>


>diff --git a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err
>deleted file mode 100644
>index 9f0a88b826..0000000000
>--- a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err
>+++ /dev/null
>@@ -1 +0,0 @@
>-unsupported configuration: acpi-bridge-hotplug is not available for architecture 'aarch64'

Jano
-------------- 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/20211011/8bdfe78a/attachment-0001.sig>