[PATCH 04/31] qemuxml2argvtest: Fix serial-unix-missing-source case
Use x86_64 emulator and machine and remove the nocaps version of the
test.
Fixes: 80a37e96a95
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/serial-unix-missing-source.err | 1 -
.../serial-unix-missing-source.x86_64-latest.err | 2 +-
tests/qemuxml2argvdata/serial-unix-missing-source.xml | 4 ++--
tests/qemuxml2argvtest.c | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/serial-unix-missing-source.err
diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.err
b/tests/qemuxml2argvdata/serial-unix-missing-source.err
deleted file mode 100644
index bfbefc8cce..0000000000
--- a/tests/qemuxml2argvdata/serial-unix-missing-source.err
+++ /dev/null
@@ -1 +0,0 @@
-internal error: Missing source path attribute for char device
diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err
b/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err
index 86be3aead4..bfbefc8cce 100644
--- a/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err
+++ b/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err
@@ -1 +1 @@
-unsupported configuration: Emulator '/usr/bin/qemu-system-aarch64' does not
support arch 'aarch64'
+internal error: Missing source path attribute for char device
diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.xml
b/tests/qemuxml2argvdata/serial-unix-missing-source.xml
index 1e1221f12d..462f2b429e 100644
--- a/tests/qemuxml2argvdata/serial-unix-missing-source.xml
+++ b/tests/qemuxml2argvdata/serial-unix-missing-source.xml
@@ -4,10 +4,10 @@
<memory unit='KiB'>1048576</memory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='aarch64' machine='virt'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<serial type='unix'>
<target type='pci-serial'/>
</serial>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5a33c336c8..fa60028cf0 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1551,7 +1551,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("serial-dev-chardev-iobase");
DO_TEST_CAPS_LATEST("serial-file-chardev");
DO_TEST_CAPS_LATEST("serial-unix-chardev");
- DO_TEST_PARSE_ERROR_NOCAPS("serial-unix-missing-source");
DO_TEST("serial-tcp-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-udp-chardev",
--
2.39.2