[PATCH 12/14] qemuxml2argvtest: Modernize the rest of 'graphics-vnc' tests

As with previous test replace the fake caps versions with a combination of DO_TEST_CAPS_VER(..., "2.11.0") and DO_TEST_CAPS_LATEST(). Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...phics-vnc-egl-headless.x86_64-2.11.0.args} | 5 ++- ...aphics-vnc-egl-headless.x86_64-latest.args | 37 +++++++++++++++++++ ...ics-vnc-no-listen-attr.x86_64-2.11.0.args} | 5 ++- ...hics-vnc-no-listen-attr.x86_64-latest.args | 36 ++++++++++++++++++ ...s => graphics-vnc-none.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc-none.x86_64-latest.args | 33 +++++++++++++++++ ...=> graphics-vnc-policy.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc-policy.x86_64-latest.args | 36 ++++++++++++++++++ ...emove-generated-socket.x86_64-2.11.0.args} | 5 ++- ...remove-generated-socket.x86_64-latest.args | 36 ++++++++++++++++++ ...s => graphics-vnc-sasl.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc-sasl.x86_64-latest.args | 37 +++++++++++++++++++ ...vnc-socket-new-cmdline.x86_64-2.11.0.args} | 5 ++- ...-vnc-socket-new-cmdline.x86_64-latest.args | 33 +++++++++++++++++ ...graphics-vnc-websocket.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc-websocket.x86_64-latest.args | 33 +++++++++++++++++ ...c.args => graphics-vnc.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc.x86_64-latest.args | 36 ++++++++++++++++++ tests/qemuxml2argvtest.c | 36 +++++++++--------- 19 files changed, 362 insertions(+), 36 deletions(-) rename tests/qemuxml2argvdata/{graphics-vnc-egl-headless.args => graphics-vnc-egl-headless.x86_64-2.11.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-no-listen-attr.args => graphics-vnc-no-listen-attr.x86_64-2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-none.args => graphics-vnc-none.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-policy.args => graphics-vnc-policy.x86_64-2.11.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-remove-generated-socket.args => graphics-vnc-remove-generated-socket.x86_64-2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-sasl.args => graphics-vnc-sasl.x86_64-2.11.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-socket-new-cmdline.args => graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-websocket.args => graphics-vnc-websocket.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc.args => graphics-vnc.x86_64-2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args similarity index 84% rename from tests/qemuxml2argvdata/graphics-vnc-egl-headless.args rename to tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args index 72443b3ef4..2de4371574 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,10 +24,11 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc '[2001:1:2:3:4:5:1234:1234]:3' \ -display egl-headless \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args new file mode 100644 index 0000000000..82e3659173 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args @@ -0,0 +1,37 @@ +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 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device 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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-audiodev id=audio1,driver=none \ +-vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=audio1' \ +-display egl-headless,rendernode=/dev/dri/foo \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.args similarity index 83% rename from tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args rename to tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.args index bd39da09c7..d74be40471 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,9 +24,10 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc '[2001:1:2:3:4:5:1234:1234]:3' \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args new file mode 100644 index 0000000000..a0bc3560d8 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args @@ -0,0 +1,36 @@ +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 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device 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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-audiodev id=audio1,driver=none \ +-vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=audio1' \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args similarity index 81% rename from tests/qemuxml2argvdata/graphics-vnc-none.args rename to tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args index 766b8943cd..54e7a16312 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.args +++ b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,7 +24,8 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -vnc none \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args new file mode 100644 index 0000000000..32b54db8cd --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args @@ -0,0 +1,33 @@ +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 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-audiodev id=audio1,driver=none \ +-vnc none,audiodev=audio1 \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.args similarity index 84% rename from tests/qemuxml2argvdata/graphics-vnc-policy.args rename to tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.args index 090b94878a..65858f4e29 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,9 +24,10 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc '[::]:59630,share=allow-exclusive' \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args new file mode 100644 index 0000000000..d7ec89dd2e --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args @@ -0,0 +1,36 @@ +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 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device 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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-audiodev id=audio1,driver=none \ +-vnc '[::]:59630,share=allow-exclusive,audiodev=audio1' \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.11.0.args similarity index 83% rename from tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args rename to tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.11.0.args index 22bcf33fcd..472a023d67 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,9 +24,10 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc 127.0.0.1:0 \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-latest.args new file mode 100644 index 0000000000..17eb03319d --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-latest.args @@ -0,0 +1,36 @@ +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 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device 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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-audiodev id=audio1,driver=none \ +-vnc 127.0.0.1:0,audiodev=audio1 \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args similarity index 84% rename from tests/qemuxml2argvdata/graphics-vnc-sasl.args rename to tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args index f5c4b7dfa9..e9335fbc15 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args @@ -12,7 +12,7 @@ SASL_CONF_PATH=/root/.sasl2 \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -25,9 +25,10 @@ SASL_CONF_PATH=/root/.sasl2 \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc 127.0.0.1:3,sasl=on \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args new file mode 100644 index 0000000000..46dbde8e51 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args @@ -0,0 +1,37 @@ +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 \ +SASL_CONF_PATH=/root/.sasl2 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device 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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-audiodev id=audio1,driver=none \ +-vnc 127.0.0.1:3,sasl=on,audiodev=audio1 \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args similarity index 81% rename from tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args rename to tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args index 8ebf57fd09..9f268c6503 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,7 +24,8 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -vnc vnc=unix:/tmp/foo=bar.sock \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args new file mode 100644 index 0000000000..9c87bab4d2 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args @@ -0,0 +1,33 @@ +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 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-audiodev id=audio1,driver=none \ +-vnc vnc=unix:/tmp/foo=bar.sock,audiodev=audio1 \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args similarity index 81% rename from tests/qemuxml2argvdata/graphics-vnc-websocket.args rename to tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args index ba963db2d4..7e841f07be 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,7 +24,8 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -vnc 127.0.0.1:0,websocket=5700 \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args new file mode 100644 index 0000000000..ac7129d400 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args @@ -0,0 +1,33 @@ +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 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-audiodev id=audio1,driver=none \ +-vnc 127.0.0.1:0,websocket=5700,audiodev=audio1 \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.args similarity index 83% rename from tests/qemuxml2argvdata/graphics-vnc.args rename to tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.args index bd39da09c7..d74be40471 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.args +++ b/tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,9 +24,10 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -vnc '[2001:1:2:3:4:5:1234:1234]:3' \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args new file mode 100644 index 0000000000..a0bc3560d8 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args @@ -0,0 +1,36 @@ +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 \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device 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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-audiodev id=audio1,driver=none \ +-vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=audio1' \ +-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fdd38ee1a1..e126e828eb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1453,33 +1453,35 @@ mymain(void) /* DO_TEST_CAPS_VER("graphics-vnc-*", "2.11.0"); were added as a demonstration * that the old fake-caps tests were already using the new format, thus * they can be removed without replacement when "2.11.0" will be retired */ - DO_TEST("graphics-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc"); DO_TEST_CAPS_VER("graphics-vnc-socket", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-socket"); - DO_TEST("graphics-vnc-websocket", - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc-websocket", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-websocket"); + DO_TEST_CAPS_VER("graphics-vnc-policy", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-policy"); DO_TEST_CAPS_LATEST("graphics-vnc-power"); - DO_TEST("graphics-vnc-no-listen-attr", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-vnc-remove-generated-socket", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc-no-listen-attr", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-no-listen-attr"); + DO_TEST_CAPS_VER("graphics-vnc-remove-generated-socket", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-remove-generated-socket"); driver.config->vncAutoUnixSocket = true; DO_TEST_CAPS_VER("graphics-vnc-auto-socket-cfg", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket-cfg"); driver.config->vncAutoUnixSocket = false; DO_TEST_CAPS_VER("graphics-vnc-auto-socket", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket"); - DO_TEST("graphics-vnc-none", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-vnc-socket-new-cmdline", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc-none", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-none"); + DO_TEST_CAPS_VER("graphics-vnc-socket-new-cmdline", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-socket-new-cmdline"); driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); driver.config->vncSASLdir = g_strdup("/root/.sasl2"); - DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc-sasl", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-sasl"); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; DO_TEST_CAPS_VER("graphics-vnc-tls", "2.11.0"); @@ -1491,10 +1493,8 @@ mymain(void) driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0; VIR_FREE(driver.config->vncSASLdir); VIR_FREE(driver.config->vncTLSx509certdir); - DO_TEST("graphics-vnc-egl-headless", - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_EGL_HEADLESS); + DO_TEST_CAPS_VER("graphics-vnc-egl-headless", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-egl-headless"); DO_TEST("graphics-sdl", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_SDL); -- 2.31.1