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

[Andrea Bolognani]

On Mon, Oct 11, 2021 at 04:51:40PM +0200, Ján Tomko wrote:
> On a Monday in 2021, Peter Krempa wrote:
> > +++ 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.
>
> +++ 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'/>

This change is correct.

>      <input type='mouse' bus='ps2'/>
>      <input type='keyboard' bus='ps2'/>

The PS/2 input devices, on the other hand, don't make a lot of sense
on Arm.

You could actually trim the input file down to

  <domain type='qemu'>
    <name>test</name>
    <memory unit='KiB'>1048576</memory>
    <vcpu placement='static'>1</vcpu>
    <os>
      <type arch='aarch64' machine='virt'>hvm</type>
    </os>
    <features>
      <pci>
        <acpi-bridge-hotplug state='off'/>
      </pci>
    </features>
  </domain>

but that might be considered to be beyond the scope of this series.

-- 
Andrea Bolognani / Red Hat / Virtualization