8:02 a.m.
The filesystem commandline doesn't differ in the '-latest' cases.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/fs9p-ccw.args | 36 ----------------------------
tests/qemuxml2argvdata/fs9p.args | 34 --------------------------
tests/qemuxml2argvtest.c | 2 --
3 files changed, 72 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/fs9p-ccw.args
delete mode 100644 tests/qemuxml2argvdata/fs9p.args
diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
deleted file mode 100644
index 9cc700e0ce..0000000000
--- a/tests/qemuxml2argvdata/fs9p-ccw.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
--device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,devno=fe.0.0001
\
--fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2
\
--device virtio-9p-ccw,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,devno=fe.0.0002
\
--fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \
--device virtio-9p-ccw,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,devno=fe.0.0003
\
--device virtio-balloon-ccw,id=balloon0,devno=fe.0.0004 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
deleted file mode 100644
index a138c5f53c..0000000000
--- a/tests/qemuxml2argvdata/fs9p.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off
\
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
--device
virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x2 \
--fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2
\
--device
virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,bus=pci.0,addr=0x3 \
--fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \
--device
virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,bus=pci.0,addr=0x4 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b464d4bb68..c696424f8f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1860,9 +1860,7 @@ mymain(void)
QEMU_CAPS_HDA_OUTPUT,
QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
QEMU_CAPS_OBJECT_USB_AUDIO);
- DO_TEST_NOCAPS("fs9p");
DO_TEST_CAPS_LATEST("fs9p");
- DO_TEST("fs9p-ccw", QEMU_CAPS_CCW);
DO_TEST_CAPS_ARCH_LATEST("fs9p-ccw", "s390x");
DO_TEST_NOCAPS("hostdev-usb-address");
--
2.31.1