qemuxml2argvtest: Enable 'graphics-listen-network' case

Use the data from 'nat-network' network definition to enable the test
case also for xml2argvtest.

Since the network listen bit doesn't need any plug definition just use
an empty string.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxml2argvdata/graphics-listen-network.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-listen-network.x86_64-latest.args
new file mode 100644 (file)
index 0000000..c49abca
--- /dev/null
+++ b/tests/qemuxml2argvdata/graphics-listen-network.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-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 \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 192.168.122.1:3,audiodev=audio1 \
+-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on

diff --git a/tests/qemuxml2argvdata/graphics-listen-network.xml b/tests/qemuxml2argvdata/graphics-listen-network.xml
index f1ab81ca0b5ade7041ef06f509f293f532be2ed6..cc7301149f72ba7245e62df6433d6a69be57d350 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-listen-network.xml
+++ b/tests/qemuxml2argvdata/graphics-listen-network.xml
@@ -25,7 +25,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no'>
-      <listen type='network' network='Bobsnetwork'/>
+      <listen type='network' network='nat-network;'/>
     </graphics>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 0ca4d3a267204cdb7aca66beaf1287847436ae8f..7313dec79211e9da882dbfb5dbe4721b6f80042e 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2583,6 +2583,8 @@ mymain(void)
     DO_TEST_CAPS_LATEST("vhost-user-fs-sock");
     DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw-auto", "s390x");
 
+    DO_TEST_CAPS_LATEST("graphics-listen-network");
+
     qemuTestDriverFree(&driver);
     virFileWrapperClearPrefixes();
 

diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml
index ab4aa8cafa49ee1d41681c35cb583974043d6618..af8947013859d315cd34dfcceab0e7b3802f0e68 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml
@@ -33,7 +33,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no'>
-      <listen type='network' network='Bobsnetwork'/>
+      <listen type='network' network='nat-network;'/>
     </graphics>
     <audio id='1' type='none'/>
     <video>