qemuxml2argvtest: Drop 'monitor-json' case

QMP monitor is the only thing we support at this point, thus all other
tests test the same thing.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
deleted file mode 100644 (file)
index 817806f..0000000
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=encryptdisk,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
--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 \
--no-acpi \
--boot strict=on \
--usb \
--blockdev '{"driver":"file","filename":"/dev/hda1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on

diff --git a/tests/qemuxml2argvdata/monitor-json.xml b/tests/qemuxml2argvdata/monitor-json.xml
deleted file mode 100644 (file)
index d151884..0000000
--- a/tests/qemuxml2argvdata/monitor-json.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<domain type='qemu'>
-  <name>encryptdisk</name>
-  <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid>
-  <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/dev/hda1'/>
-      <target dev='hda'/>
-    </disk>
-    <controller type='usb' index='0'/>
-    <memballoon model='virtio'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3c2156118a00590fa528e7cd3e9c3afd59d32fc7..8238dceed820b991f9727e3f219271ee9d221aca 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1892,8 +1892,6 @@ mymain(void)
     DO_TEST("multifunction-pci-device",
             QEMU_CAPS_SCSI_LSI);
 
-    DO_TEST_NOCAPS("monitor-json");
-
     DO_TEST_NOCAPS("seclabel-dynamic");
     DO_TEST_NOCAPS("seclabel-dynamic-baselabel");
     DO_TEST_NOCAPS("seclabel-dynamic-override");