[PATCH 08/25] qemuxmlconfdata: Add tests for USB controller selection with 'versatilepb' machine on arm qemu binary

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...lepb-minimal.armv7l-latest.abi-update.args | 32 +++++++++++++++++++ ...ilepb-minimal.armv7l-latest.abi-update.xml | 23 +++++++++++++ ...v7l-versatilepb-minimal.armv7l-latest.args | 32 +++++++++++++++++++ ...mv7l-versatilepb-minimal.armv7l-latest.xml | 23 +++++++++++++ .../armv7l-versatilepb-minimal.xml | 13 ++++++++ ...back-versatilepb-armv7l.armv7l-latest.args | 32 +++++++++++++++++++ ...lback-versatilepb-armv7l.armv7l-latest.xml | 27 ++++++++++++++++ ...er-default-fallback-versatilepb-armv7l.xml | 1 + ...able-versatilepb-armv7l.armv7l-latest.args | 32 +++++++++++++++++++ ...lable-versatilepb-armv7l.armv7l-latest.xml | 27 ++++++++++++++++ ...default-unavailable-versatilepb-armv7l.xml | 1 + ...ault-versatilepb-armv7l.armv7l-latest.args | 32 +++++++++++++++++++ ...fault-versatilepb-armv7l.armv7l-latest.xml | 27 ++++++++++++++++ ...-controller-default-versatilepb-armv7l.xml | 15 +++++++++ tests/qemuxmlconftest.c | 14 ++++++++ 15 files changed, 331 insertions(+) create mode 100644 tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.args create mode 100644 tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml create mode 100644 tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args create mode 100644 tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml create mode 100644 tests/qemuxmlconfdata/armv7l-versatilepb-minimal.xml create mode 100644 tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.armv7l-latest.args create mode 100644 tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.armv7l-latest.xml create mode 120000 tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.xml create mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.args create mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.xml create mode 120000 tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.xml create mode 100644 tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.armv7l-latest.args create mode 100644 tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.armv7l-latest.xml create mode 100644 tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.xml diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.args b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.args new file mode 100644 index 0000000000..d7bad74061 --- /dev/null +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \ +/usr/bin/qemu-system-armv7l \ +-name guest=armv7ltest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armv7ltest/master-key.aes"}' \ +-machine versatilepb,usb=off,dump-guest-core=off,memory-backend=versatile.ram \ +-accel tcg \ +-cpu arm926 \ +-m size=1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"versatile.ram","size":1073741824}' \ +-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/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml new file mode 100644 index 0000000000..b2a8d254d6 --- /dev/null +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml @@ -0,0 +1,23 @@ +<domain type='qemu'> + <name>armv7ltest</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='armv7l' machine='versatilepb'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>arm926</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-armv7l</emulator> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args new file mode 100644 index 0000000000..d7bad74061 --- /dev/null +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \ +/usr/bin/qemu-system-armv7l \ +-name guest=armv7ltest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armv7ltest/master-key.aes"}' \ +-machine versatilepb,usb=off,dump-guest-core=off,memory-backend=versatile.ram \ +-accel tcg \ +-cpu arm926 \ +-m size=1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"versatile.ram","size":1073741824}' \ +-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/armv7l-versatilepb-minimal.armv7l-latest.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml new file mode 100644 index 0000000000..b2a8d254d6 --- /dev/null +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml @@ -0,0 +1,23 @@ +<domain type='qemu'> + <name>armv7ltest</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='armv7l' machine='versatilepb'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>arm926</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-armv7l</emulator> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.xml new file mode 100644 index 0000000000..77cd254048 --- /dev/null +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.xml @@ -0,0 +1,13 @@ +<domain type='qemu'> + <name>armv7ltest</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='armv7l' machine='versatilepb'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-armv7l</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.armv7l-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.armv7l-latest.args new file mode 100644 index 0000000000..d7bad74061 --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.armv7l-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \ +/usr/bin/qemu-system-armv7l \ +-name guest=armv7ltest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armv7ltest/master-key.aes"}' \ +-machine versatilepb,usb=off,dump-guest-core=off,memory-backend=versatile.ram \ +-accel tcg \ +-cpu arm926 \ +-m size=1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"versatile.ram","size":1073741824}' \ +-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/usb-controller-default-fallback-versatilepb-armv7l.armv7l-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.armv7l-latest.xml new file mode 100644 index 0000000000..ebea79c6d0 --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.armv7l-latest.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>armv7ltest</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='armv7l' machine='versatilepb'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>arm926</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-armv7l</emulator> + <controller type='pci' index='0' model='pci-root'/> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.xml new file mode 120000 index 0000000000..283956fe0b --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-armv7l.xml @@ -0,0 +1 @@ +usb-controller-default-versatilepb-armv7l.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.args b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.args new file mode 100644 index 0000000000..d7bad74061 --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \ +/usr/bin/qemu-system-armv7l \ +-name guest=armv7ltest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armv7ltest/master-key.aes"}' \ +-machine versatilepb,usb=off,dump-guest-core=off,memory-backend=versatile.ram \ +-accel tcg \ +-cpu arm926 \ +-m size=1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"versatile.ram","size":1073741824}' \ +-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/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.xml new file mode 100644 index 0000000000..ebea79c6d0 --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>armv7ltest</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='armv7l' machine='versatilepb'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>arm926</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-armv7l</emulator> + <controller type='pci' index='0' model='pci-root'/> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.xml new file mode 120000 index 0000000000..283956fe0b --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.xml @@ -0,0 +1 @@ +usb-controller-default-versatilepb-armv7l.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.armv7l-latest.args b/tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.armv7l-latest.args new file mode 100644 index 0000000000..8636c54dfe --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.armv7l-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \ +/usr/bin/qemu-system-armv7l \ +-name guest=armv7ltest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armv7ltest/master-key.aes"}' \ +-machine versatilepb,usb=off,dump-guest-core=off,memory-backend=versatile.ram \ +-accel tcg \ +-cpu arm926 \ +-m size=1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"versatile.ram","size":1073741824}' \ +-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":"piix3-usb-uhci","id":"usb","bus":"pci","addr":"0x1"}' \ +-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-versatilepb-armv7l.armv7l-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.armv7l-latest.xml new file mode 100644 index 0000000000..dc1b37d626 --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.armv7l-latest.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>armv7ltest</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='armv7l' machine='versatilepb'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>arm926</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-armv7l</emulator> + <controller type='pci' index='0' model='pci-root'/> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.xml b/tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.xml new file mode 100644 index 0000000000..b496f2f9f0 --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb-armv7l.xml @@ -0,0 +1,15 @@ +<domain type='qemu'> + <name>armv7ltest</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='armv7l' machine='versatilepb'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-armv7l</emulator> + <controller type='pci' index='0' model='pci-root'/> + <controller type='usb' index='0'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 0b1e1bf4e8..8dd10c47ba 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1244,6 +1244,8 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-virt-minimal", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-versatilepb-minimal", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-versatilepb-minimal", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("armv7l-versatilepb-minimal", "armv7l"); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("armv7l-versatilepb-minimal", "armv7l"); 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"); @@ -1882,6 +1884,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-versatilepb-armv7l", "armv7l"); + DO_TEST_FULL("usb-controller-default-fallback-versatilepb-armv7l", ".armv7l-latest", + ARG_CAPS_ARCH, "armv7l", + 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-versatilepb-armv7l", ".armv7l-latest", + ARG_CAPS_ARCH, "armv7l", + 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