[PATCH 02/17] qemuxml2agvtest: Retire tests based on qemu-2.11

Upcoming patches will raise the minimum required qemu version to 3.1. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../cpu-host-model.x86_64-2.11.0.args | 36 -------------- ...ics-vnc-auto-socket-cfg.x86_64-2.11.0.args | 34 ------------- ...raphics-vnc-auto-socket.x86_64-2.11.0.args | 32 ------------- ...aphics-vnc-egl-headless.x86_64-2.11.0.args | 35 -------------- ...hics-vnc-no-listen-attr.x86_64-2.11.0.args | 34 ------------- .../graphics-vnc-none.x86_64-2.11.0.args | 32 ------------- .../graphics-vnc-policy.x86_64-2.11.0.args | 34 ------------- ...remove-generated-socket.x86_64-2.11.0.args | 34 ------------- .../graphics-vnc-sasl.x86_64-2.11.0.args | 35 -------------- ...-vnc-socket-new-cmdline.x86_64-2.11.0.args | 32 ------------- .../graphics-vnc-socket.x86_64-2.11.0.args | 32 ------------- .../graphics-vnc-tls.x86_64-2.11.0.args | 34 ------------- .../graphics-vnc-websocket.x86_64-2.11.0.args | 32 ------------- .../graphics-vnc.x86_64-2.11.0.args | 34 ------------- .../name-escape.x86_64-2.11.0.args | 48 ------------------- tests/qemuxml2argvtest.c | 18 ------- 16 files changed, 536 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.args delete mode 100644 tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args deleted file mode 100644 index 2d74495626..0000000000 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.11,usb=off,dump-guest-core=off \ --accel kvm \ --cpu Skylake-Client,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,xsaves=on,pdpe1gb=on \ --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 \ --device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \ --device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \ --device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \ --device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args deleted file mode 100644 index 3374efeee5..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0.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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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 vnc=unix:/tmp/lib/domain--1-QEMUGuest1/vnc.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-auto-socket.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args deleted file mode 100644 index 76615be6d0..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args +++ /dev/null @@ -1,32 +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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --vnc vnc=unix:/tmp/lib/domain--1-QEMUGuest1/vnc.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-egl-headless.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args deleted file mode 100644 index ba7242c8e7..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args +++ /dev/null @@ -1,35 +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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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-no-listen-attr.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.args deleted file mode 100644 index 9e44e4dd83..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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-none.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args deleted file mode 100644 index d9cee87446..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args +++ /dev/null @@ -1,32 +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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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-policy.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.args deleted file mode 100644 index 0d7e0588f1..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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-remove-generated-socket.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.11.0.args deleted file mode 100644 index 1c63396909..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.11.0.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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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-sasl.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args deleted file mode 100644 index e586b1cb49..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args +++ /dev/null @@ -1,35 +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 \ -SASL_CONF_PATH=/root/.sasl2 \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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-socket-new-cmdline.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args deleted file mode 100644 index a2b881f948..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args +++ /dev/null @@ -1,32 +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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-2.11.0.args deleted file mode 100644 index c07074aa07..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-2.11.0.args +++ /dev/null @@ -1,32 +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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --vnc vnc=unix:/tmp/vnc.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-tls.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args deleted file mode 100644 index d686ce6abb..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.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 \ -SASL_CONF_PATH=/root/.sasl2 \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,endpoint=server,verify-peer=on \ --vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,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-websocket.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args deleted file mode 100644 index ba1a0e7905..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args +++ /dev/null @@ -1,32 +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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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.x86_64-2.11.0.args b/tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.args deleted file mode 100644 index 9e44e4dd83..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.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-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --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/name-escape.x86_64-2.11.0.args b/tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args deleted file mode 100644 index e64051e219..0000000000 --- a/tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args +++ /dev/null @@ -1,48 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-foo=1,bar=2 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-foo=1,bar=2/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-foo=1,bar=2/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-foo=1,bar=2/.config \ -QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-x86_64 \ --name guest=foo=1,,bar=2,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo=1,,bar=2/master-key.aes \ --machine pc-i440fx-2.11,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo=1,,bar=2/monitor.sock,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 \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --device usb-ccid,id=ccid0,bus=usb.0,port=1 \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none,throttling.bps-total=5000,throttling.iops-total=6000,throttling.bps-total-max=10000,throttling.iops-total-max=11000,throttling.group=libvirt_iotune_group1,,foo \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,write-cache=on \ --device ccid-card-emulated,backend=certificates,cert1=cert1,,foo,cert2=cert2,cert3=cert3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \ --chardev tty,id=charserial0,path=/dev/ttyS2,,foo \ --device isa-serial,chardev=charserial0,id=serial0,index=1 \ --add-fd set=0,fd=1750,opaque=serial1-source \ --chardev file,id=charserial1,path=/dev/fdset/0,append=on \ --device isa-serial,chardev=charserial1,id=serial1,index=0 \ --chardev pipe,id=charchannel0,path=/tmp/guestfwd,,foo \ --netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \ --vnc vnc=unix:/tmp/lib/domain--1-foo=1,,bar=2/vnc.sock \ --spice unix,addr=/tmp/lib/domain--1-foo=1,,bar=2/spice.sock,gl=on,rendernode=/dev/dri/foo,,bar,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --drive file.driver=iscsi,file.portal=example.foo.org:3260,file.target=iqn.1992-01.com.example:my,,storage,file.lun=1,file.transport=tcp,if=none,format=raw,id=drive-hostdev0 \ --device scsi-generic,drive=drive-hostdev0,id=hostdev0,bus=scsi0.0,channel=0,scsi-id=0,lun=4 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e7fecb24d3..dc508939c1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1482,41 +1482,26 @@ mymain(void) DO_TEST_CAPS_LATEST("graphics-egl-headless"); DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode"); - /* 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_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_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_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_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_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"); DO_TEST_CAPS_LATEST("graphics-vnc-tls"); driver.config->vncTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); DO_TEST_CAPS_VER("graphics-vnc-tls-secret", "5.2.0"); @@ -1525,7 +1510,6 @@ mymain(void) driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0; VIR_FREE(driver.config->vncSASLdir); VIR_FREE(driver.config->vncTLSx509certdir); - DO_TEST_CAPS_VER("graphics-vnc-egl-headless", "2.11.0"); DO_TEST_CAPS_LATEST("graphics-vnc-egl-headless"); DO_TEST("graphics-sdl", @@ -2055,7 +2039,6 @@ mymain(void) /* host-model cpu expansion depends on the cpu reported by qemu and thus * we invoke it for all real capability dumps we have */ - DO_TEST_CAPS_VER("cpu-host-model", "2.11.0"); DO_TEST_CAPS_VER("cpu-host-model", "2.12.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.1.0"); @@ -3229,7 +3212,6 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("missing-machine"); - DO_TEST_CAPS_VER("name-escape", "2.11.0"); DO_TEST_CAPS_LATEST("name-escape"); DO_TEST_NOCAPS("master-key"); -- 2.35.1