The 'borzoi' machine doesn't honour '-usb' in qemu so use it as an
example for the upcoming patch for removing '-usb' support.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 ...usb-minimal.aarch64-latest.abi-update.args | 31 +++++++++++++++++++
 ...ousb-minimal.aarch64-latest.abi-update.xml | 21 +++++++++++++
 .../aarch64-nousb-minimal.aarch64-latest.args | 31 +++++++++++++++++++
 .../aarch64-nousb-minimal.aarch64-latest.xml  | 21 +++++++++++++
 .../qemuxmlconfdata/aarch64-nousb-minimal.xml | 15 +++++++++
 ...default-fallback-nousb.aarch64-latest.args | 31 +++++++++++++++++++
 ...-default-fallback-nousb.aarch64-latest.xml | 23 ++++++++++++++
 .../usb-controller-default-fallback-nousb.xml |  1 +
 ...ntroller-default-nousb.aarch64-latest.args | 31 +++++++++++++++++++
 ...ontroller-default-nousb.aarch64-latest.xml | 23 ++++++++++++++
 .../usb-controller-default-nousb.xml          | 17 ++++++++++
 ...ault-unavailable-nousb.aarch64-latest.args | 31 +++++++++++++++++++
 ...fault-unavailable-nousb.aarch64-latest.xml | 23 ++++++++++++++
 ...b-controller-default-unavailable-nousb.xml |  1 +
 tests/qemuxmlconftest.c                       | 14 +++++++++
 15 files changed, 314 insertions(+)
 create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
 create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml
 create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
 create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
 create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
 create mode 100644 tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.args
 create mode 100644 tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
 create mode 120000 tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.xml
 create mode 100644 tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args
 create mode 100644 tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
 create mode 100644 tests/qemuxmlconfdata/usb-controller-default-nousb.xml
 create mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.args
 create mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
 create mode 120000 tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.xml

diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
new file mode 100644
index 0000000000..dc67ca5f75
--- /dev/null
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=aarch64test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
+-machine borzoi,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu host \
+-m size=1048576k \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml
new file mode 100644
index 0000000000..9bf4af4f74
--- /dev/null
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml
@@ -0,0 +1,21 @@
+<domain type='kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough' check='none'/>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
new file mode 100644
index 0000000000..dc67ca5f75
--- /dev/null
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=aarch64test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
+-machine borzoi,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu host \
+-m size=1048576k \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
new file mode 100644
index 0000000000..9bf4af4f74
--- /dev/null
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
@@ -0,0 +1,21 @@
+<domain type='kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough' check='none'/>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
new file mode 100644
index 0000000000..64cd74e365
--- /dev/null
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
@@ -0,0 +1,15 @@
+<domain type='kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <!-- machine type doesn't matter as long as it has no implicit USB -->
+    <type arch='aarch64' machine='borzoi'>hvm</type>
+  </os>
+  <cpu mode='host-passthrough'/>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.args
new file mode 100644
index 0000000000..6cfa04a0f4
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=aarch64test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
+-machine borzoi,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu host \
+-m size=1048576k \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"qemu-xhci","id":"usb"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
new file mode 100644
index 0000000000..2f71d294a7
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
@@ -0,0 +1,23 @@
+<domain type='kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough' check='none'/>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
+    <controller type='usb' index='0' model='qemu-xhci'/>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.xml
new file mode 120000
index 0000000000..9cba7c3a06
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.xml
@@ -0,0 +1 @@
+usb-controller-default-nousb.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args
new file mode 100644
index 0000000000..6cfa04a0f4
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=aarch64test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
+-machine borzoi,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu host \
+-m size=1048576k \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"qemu-xhci","id":"usb"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
new file mode 100644
index 0000000000..2f71d294a7
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
@@ -0,0 +1,23 @@
+<domain type='kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough' check='none'/>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
+    <controller type='usb' index='0' model='qemu-xhci'/>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml b/tests/qemuxmlconfdata/usb-controller-default-nousb.xml
new file mode 100644
index 0000000000..c8bd07ad5d
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.xml
@@ -0,0 +1,17 @@
+<domain type='kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <!-- machine type doesn't matter as long as it has no implicit USB -->
+    <type arch='aarch64' machine='borzoi'>hvm</type>
+  </os>
+  <cpu mode='host-passthrough'/>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
+    <controller type='usb' index='0'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.args
new file mode 100644
index 0000000000..6cfa04a0f4
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=aarch64test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
+-machine borzoi,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu host \
+-m size=1048576k \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"qemu-xhci","id":"usb"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
new file mode 100644
index 0000000000..2f71d294a7
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
@@ -0,0 +1,23 @@
+<domain type='kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough' check='none'/>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
+    <controller type='usb' index='0' model='qemu-xhci'/>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.xml
new file mode 120000
index 0000000000..9cba7c3a06
--- /dev/null
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.xml
@@ -0,0 +1 @@
+usb-controller-default-nousb.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 35a3a306b0..f250fd1ff1 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1248,6 +1248,8 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("armv7l-versatilepb-minimal", "armv7l");
     DO_TEST_CAPS_ARCH_LATEST("aarch64-realview-minimal", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-realview-minimal", "aarch64");
+    DO_TEST_CAPS_ARCH_LATEST("aarch64-nousb-minimal", "aarch64");
+    DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-nousb-minimal", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-minimal", "riscv64");
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("riscv64-virt-minimal", "riscv64");
     DO_TEST_CAPS_ARCH_LATEST("ppc64-pseries-minimal", "ppc64");
@@ -1910,6 +1912,18 @@ mymain(void)
                  ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_LAST,
                  ARG_END);

+    DO_TEST_CAPS_ARCH_LATEST("usb-controller-default-nousb", "aarch64");
+    DO_TEST_FULL("usb-controller-default-fallback-nousb", ".aarch64-latest",
+                 ARG_CAPS_ARCH, "aarch64",
+                 ARG_CAPS_VER, "latest",
+                 ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST,
+                 ARG_END);
+    DO_TEST_FULL("usb-controller-default-unavailable-nousb", ".aarch64-latest",
+                 ARG_CAPS_ARCH, "aarch64",
+                 ARG_CAPS_VER, "latest",
+                 ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_LAST,
+                 ARG_END);
+
     DO_TEST_CAPS_LATEST("usb-none");

     DO_TEST_CAPS_LATEST("usb-controller-piix3");
-- 
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

On Tue, Feb 27, 2024 at 05:36:16PM +0100, Peter Krempa wrote:
> +++ b/tests/qemuxmlconftest.c
> @@ -1248,6 +1248,8 @@ mymain(void)
>      DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("armv7l-versatilepb-minimal", "armv7l");
>      DO_TEST_CAPS_ARCH_LATEST("aarch64-realview-minimal", "aarch64");
>      DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-realview-minimal", "aarch64");
> +    DO_TEST_CAPS_ARCH_LATEST("aarch64-nousb-minimal", "aarch64");
> +    DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-nousb-minimal", "aarch64");

Other test cases are named after the machine type, so I think these
should also be aarch64-borzoi-*.

As an additional note, it would IMO be preferable to add all these
test cases at the very beginning of the series, before making any
functional changes. This is nicer because it establishes a baseline
for the current behavior, and as the various patches alter that
behavior we can see this reflected in the test output. This is
already the case to some extent, I'm just suggesting going all the
way instead of adding some tests after the first round of functional
changes.

Overall the series looks great, and the amount of research and effort
you've put into it is impressive. I'm really, *really* looking
forward to seeing it merged :)

-- 
Andrea Bolognani / Red Hat / Virtualization
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

On Wed, Feb 28, 2024 at 06:43:06 -0800, Andrea Bolognani wrote:
> On Tue, Feb 27, 2024 at 05:36:16PM +0100, Peter Krempa wrote:
> > +++ b/tests/qemuxmlconftest.c
> > @@ -1248,6 +1248,8 @@ mymain(void)
> >      DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("armv7l-versatilepb-minimal", "armv7l");
> >      DO_TEST_CAPS_ARCH_LATEST("aarch64-realview-minimal", "aarch64");
> >      DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-realview-minimal", "aarch64");
> > +    DO_TEST_CAPS_ARCH_LATEST("aarch64-nousb-minimal", "aarch64");
> > +    DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-nousb-minimal", "aarch64");
> 
> Other test cases are named after the machine type, so I think these
> should also be aarch64-borzoi-*.

I opted to do something more generic here to make it obvious that we
don't care about the specific machine type if it ever were to get
deprecated in qemu. In such case this test case should not be removed
but rather a different machien type picked.

I can express that in a comment but it still requires the poor soul
upgrading capabilities in the future to rename the files once that
happens.

> As an additional note, it would IMO be preferable to add all these
> test cases at the very beginning of the series, before making any
> functional changes. This is nicer because it establishes a baseline
> for the current behavior, and as the various patches alter that
> behavior we can see this reflected in the test output. This is
> already the case to some extent, I'm just suggesting going all the
> way instead of adding some tests after the first round of functional
> changes.

Sure thing. This is an artifact of how I was developing this it should
be trivial to shuffle things around.
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

On Wed, Feb 28, 2024 at 03:50:12PM +0100, Peter Krempa wrote:
> On Wed, Feb 28, 2024 at 06:43:06 -0800, Andrea Bolognani wrote:
> > On Tue, Feb 27, 2024 at 05:36:16PM +0100, Peter Krempa wrote:
> > > +++ b/tests/qemuxmlconftest.c
> > > @@ -1248,6 +1248,8 @@ mymain(void)
> > >      DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("armv7l-versatilepb-minimal", "armv7l");
> > >      DO_TEST_CAPS_ARCH_LATEST("aarch64-realview-minimal", "aarch64");
> > >      DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-realview-minimal", "aarch64");
> > > +    DO_TEST_CAPS_ARCH_LATEST("aarch64-nousb-minimal", "aarch64");
> > > +    DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-nousb-minimal", "aarch64");
> >
> > Other test cases are named after the machine type, so I think these
> > should also be aarch64-borzoi-*.
>
> I opted to do something more generic here to make it obvious that we
> don't care about the specific machine type if it ever were to get
> deprecated in qemu. In such case this test case should not be removed
> but rather a different machien type picked.
>
> I can express that in a comment but it still requires the poor soul
> upgrading capabilities in the future to rename the files once that
> happens.

A short comment would probably be good to have regardless, as the
name alone is too short to properly communicate the intention. At
that point, up to you whether or not to rename the tests.

> > As an additional note, it would IMO be preferable to add all these
> > test cases at the very beginning of the series, before making any
> > functional changes. This is nicer because it establishes a baseline
> > for the current behavior, and as the various patches alter that
> > behavior we can see this reflected in the test output. This is
> > already the case to some extent, I'm just suggesting going all the
> > way instead of adding some tests after the first round of functional
> > changes.
>
> Sure thing. This is an artifact of how I was developing this it should
> be trivial to shuffle things around.

Thanks!

-- 
Andrea Bolognani / Red Hat / Virtualization
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org