From af5fb476da55759ba8265194e554d24f64007ceb Mon Sep 17 00:00:00 2001 From: Sebastian Mitterle Date: Tue, 22 Sep 2020 11:57:40 +0000 Subject: [PATCH] qemuxml2argvtest: Test timer validation for non-x86 arches Add minimal coverage for non-x86_64 timer validation from commit 2f5d8ffebe5d3d00e16a051ed62ce8a703f18e7c Signed-off-by: Sebastian Mitterle Reviewed-by: Peter Krempa --- .../non-x86_64-timer-error.err | 1 + .../non-x86_64-timer-error.xml | 18 ++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 tests/qemuxml2argvdata/non-x86_64-timer-error.err create mode 100644 tests/qemuxml2argvdata/non-x86_64-timer-error.xml diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.err b/tests/qemuxml2argvdata/non-x86_64-timer-error.err new file mode 100644 index 0000000000..f46673eb62 --- /dev/null +++ b/tests/qemuxml2argvdata/non-x86_64-timer-error.err @@ -0,0 +1 @@ +unsupported configuration: Configuring the 'tsc' timer is not supported for virtType=kvm arch=s390x machine=s390-ccw guests diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.xml b/tests/qemuxml2argvdata/non-x86_64-timer-error.xml new file mode 100644 index 0000000000..11559bb52b --- /dev/null +++ b/tests/qemuxml2argvdata/non-x86_64-timer-error.xml @@ -0,0 +1,18 @@ + + test + 9aa4b45c-b9dd-45ef-91fe-862b27b4231f + 262144 + 262144 + + hvm + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-s390x + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 639447e417..a3c91fd5de 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1141,6 +1141,8 @@ mymain(void) QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST_PARSE_ERROR("non-x86_64-timer-error", + QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("disk-virtio-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES);