tests: cfg2cmd: rename vnc-clipboard to lower-case and add description

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/test/cfg2cmd/VNC-clipboard-spice.conf b/test/cfg2cmd/VNC-clipboard-spice.conf
deleted file mode 100644 (file)
index 54cfa38..0000000
--- a/test/cfg2cmd/VNC-clipboard-spice.conf
+++ /dev/null
@@ -1 +0,0 @@
-vga: qxl,clipboard=vnc

diff --git a/test/cfg2cmd/VNC-clipboard-spice.conf.cmd b/test/cfg2cmd/VNC-clipboard-spice.conf.cmd
deleted file mode 100644 (file)
index f24cc7f..0000000
--- a/test/cfg2cmd/VNC-clipboard-spice.conf.cmd
+++ /dev/null
@@ -1,27 +0,0 @@
-/usr/bin/kvm \
-  -id 8006 \
-  -name 'vm8006,debug-threads=on' \
-  -no-shutdown \
-  -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
-  -mon 'chardev=qmp,mode=control' \
-  -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \
-  -mon 'chardev=qmp-event,mode=control' \
-  -pidfile /var/run/qemu-server/8006.pid \
-  -daemonize \
-  -smp '1,sockets=1,cores=1,maxcpus=1' \
-  -nodefaults \
-  -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
-  -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
-  -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \
-  -m 512 \
-  -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
-  -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \
-  -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \
-  -device 'qxl-vga,id=vga,max_outputs=4,bus=pci.0,addr=0x2' \
-  -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \
-  -chardev 'qemu-vdagent,id=vdagent,name=vdagent,clipboard=on' \
-  -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \
-  -spice 'tls-port=61000,addr=127.0.0.1,tls-ciphers=HIGH,seamless-migration=on' \
-  -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
-  -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-  -machine 'type=pc+pve0'

diff --git a/test/cfg2cmd/VNC-clipboard-std.conf b/test/cfg2cmd/VNC-clipboard-std.conf
deleted file mode 100644 (file)
index a980f42..0000000
--- a/test/cfg2cmd/VNC-clipboard-std.conf
+++ /dev/null
@@ -1 +0,0 @@
-vga: std,clipboard=vnc

diff --git a/test/cfg2cmd/VNC-clipboard-std.conf.cmd b/test/cfg2cmd/VNC-clipboard-std.conf.cmd
deleted file mode 100644 (file)
index c0c6cd2..0000000
--- a/test/cfg2cmd/VNC-clipboard-std.conf.cmd
+++ /dev/null
@@ -1,27 +0,0 @@
-/usr/bin/kvm \
-  -id 8006 \
-  -name 'vm8006,debug-threads=on' \
-  -no-shutdown \
-  -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
-  -mon 'chardev=qmp,mode=control' \
-  -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \
-  -mon 'chardev=qmp-event,mode=control' \
-  -pidfile /var/run/qemu-server/8006.pid \
-  -daemonize \
-  -smp '1,sockets=1,cores=1,maxcpus=1' \
-  -nodefaults \
-  -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
-  -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
-  -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \
-  -m 512 \
-  -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
-  -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \
-  -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \
-  -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \
-  -device 'VGA,id=vga,bus=pci.0,addr=0x2' \
-  -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \
-  -chardev 'qemu-vdagent,id=vdagent,name=vdagent,clipboard=on' \
-  -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \
-  -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
-  -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-  -machine 'type=pc+pve0'

diff --git a/test/cfg2cmd/vnc-clipboard-spice.conf b/test/cfg2cmd/vnc-clipboard-spice.conf
new file mode 100644 (file)
index 0000000..f4c917d
--- /dev/null
+++ b/test/cfg2cmd/vnc-clipboard-spice.conf
@@ -0,0 +1,2 @@
+# TEST: Test for a VNC clipboard with a SPICE QXL display
+vga: qxl,clipboard=vnc

diff --git a/test/cfg2cmd/vnc-clipboard-spice.conf.cmd b/test/cfg2cmd/vnc-clipboard-spice.conf.cmd
new file mode 100644 (file)
index 0000000..f24cc7f
--- /dev/null
+++ b/test/cfg2cmd/vnc-clipboard-spice.conf.cmd
@@ -0,0 +1,27 @@
+/usr/bin/kvm \
+  -id 8006 \
+  -name 'vm8006,debug-threads=on' \
+  -no-shutdown \
+  -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
+  -mon 'chardev=qmp,mode=control' \
+  -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \
+  -mon 'chardev=qmp-event,mode=control' \
+  -pidfile /var/run/qemu-server/8006.pid \
+  -daemonize \
+  -smp '1,sockets=1,cores=1,maxcpus=1' \
+  -nodefaults \
+  -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
+  -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
+  -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \
+  -m 512 \
+  -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
+  -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \
+  -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \
+  -device 'qxl-vga,id=vga,max_outputs=4,bus=pci.0,addr=0x2' \
+  -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \
+  -chardev 'qemu-vdagent,id=vdagent,name=vdagent,clipboard=on' \
+  -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \
+  -spice 'tls-port=61000,addr=127.0.0.1,tls-ciphers=HIGH,seamless-migration=on' \
+  -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
+  -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
+  -machine 'type=pc+pve0'

diff --git a/test/cfg2cmd/vnc-clipboard-std.conf b/test/cfg2cmd/vnc-clipboard-std.conf
new file mode 100644 (file)
index 0000000..1474766
--- /dev/null
+++ b/test/cfg2cmd/vnc-clipboard-std.conf
@@ -0,0 +1,2 @@
+# TEST: Test for a VNC clipboard with a std display
+vga: std,clipboard=vnc

diff --git a/test/cfg2cmd/vnc-clipboard-std.conf.cmd b/test/cfg2cmd/vnc-clipboard-std.conf.cmd
new file mode 100644 (file)
index 0000000..c0c6cd2
--- /dev/null
+++ b/test/cfg2cmd/vnc-clipboard-std.conf.cmd
@@ -0,0 +1,27 @@
+/usr/bin/kvm \
+  -id 8006 \
+  -name 'vm8006,debug-threads=on' \
+  -no-shutdown \
+  -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
+  -mon 'chardev=qmp,mode=control' \
+  -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \
+  -mon 'chardev=qmp-event,mode=control' \
+  -pidfile /var/run/qemu-server/8006.pid \
+  -daemonize \
+  -smp '1,sockets=1,cores=1,maxcpus=1' \
+  -nodefaults \
+  -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
+  -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \
+  -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \
+  -m 512 \
+  -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
+  -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \
+  -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \
+  -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \
+  -device 'VGA,id=vga,bus=pci.0,addr=0x2' \
+  -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \
+  -chardev 'qemu-vdagent,id=vdagent,name=vdagent,clipboard=on' \
+  -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \
+  -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
+  -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
+  -machine 'type=pc+pve0'