[PATCH 3/5] tests: Add s390-usb-model
Show what happens when trying to use a specific type of USB
controller. This currently fails because the QEMU binary doesn't
include the necessary device.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.../s390-usb-model.s390x-latest.err | 1 +
.../s390-usb-model.s390x-latest.xml | 30 +++++++++++++++++++
tests/qemuxmlconfdata/s390-usb-model.xml | 13 ++++++++
tests/qemuxmlconftest.c | 1 +
4 files changed, 45 insertions(+)
create mode 100644 tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err
create mode 100644 tests/qemuxmlconfdata/s390-usb-model.s390x-latest.xml
create mode 100644 tests/qemuxmlconfdata/s390-usb-model.xml
diff --git a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err
b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err
new file mode 100644
index 0000000000..aec91f7559
--- /dev/null
+++ b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err
@@ -0,0 +1 @@
+unsupported configuration: USB controller model 'qemu-xhci' not supported in this
QEMU binary
diff --git a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.xml
b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.xml
new file mode 100644
index 0000000000..52c6c4359d
--- /dev/null
+++ b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+ <name>test</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu</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-s390x</emulator>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'>
+ <zpci uid='0x0001' fid='0x00000000'/>
+ </address>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'/>
+ <audio id='1' type='none'/>
+ <memballoon model='none'/>
+ <panic model='s390'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/s390-usb-model.xml
b/tests/qemuxmlconfdata/s390-usb-model.xml
new file mode 100644
index 0000000000..d1019a0143
--- /dev/null
+++ b/tests/qemuxmlconfdata/s390-usb-model.xml
@@ -0,0 +1,13 @@
+<domain type='qemu'>
+ <name>test</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory>219100</memory>
+ <os>
+ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+ </os>
+ <devices>
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
+ <controller type='usb' index='0' model='qemu-xhci'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 4034d7f938..cdb0d2d701 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2321,6 +2321,7 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("s390-usb-none", "s390x");
DO_TEST_CAPS_ARCH_LATEST("s390-usb-address", "s390x");
+ DO_TEST_CAPS_ARCH_LATEST_FAILURE("s390-usb-model", "s390x");
DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address",
"s390x");
--
2.43.0