Move the test closer to other graphics-spice tests. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Tim Wiederhake <twiederh@redhat.com> --- tests/qemuxml2xmltest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a066c35db0..3abf58a9f4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -415,6 +415,9 @@ mymain(void) QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_EGL_HEADLESS); + DO_TEST("graphics-spice-timeout", + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_SPICE); DO_TEST("graphics-egl-headless-rendernode", QEMU_CAPS_DEVICE_CIRRUS_VGA, @@ -766,9 +769,6 @@ mymain(void) DO_TEST("graphics-listen-network2", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_VNC); - DO_TEST("graphics-spice-timeout", - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_SPICE); DO_TEST_NOCAPS("numad-auto-vcpu-no-numatune"); DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement"); DO_TEST_NOCAPS("numad-auto-memory-vcpu-cpuset"); -- 2.31.1

Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Tim Wiederhake <twiederh@redhat.com> --- .../graphics-spice-agent-file-xfer.args | 32 ---------- ...s-spice-agent-file-xfer.x86_64-latest.args | 35 +++++++++++ .../graphics-spice-agentmouse.args | 34 ----------- ...aphics-spice-agentmouse.x86_64-latest.args | 37 +++++++++++ ...-spice-auto-socket-cfg.x86_64-latest.args} | 17 +++--- ...hics-spice-auto-socket.x86_64-latest.args} | 17 +++--- .../graphics-spice-compression.args | 32 ---------- ...phics-spice-compression.x86_64-latest.args | 35 +++++++++++ .../graphics-spice-egl-headless.args | 32 ---------- ...hics-spice-egl-headless.x86_64-latest.args | 35 +++++++++++ .../graphics-spice-no-args.args | 31 ---------- .../graphics-spice-no-args.x86_64-latest.args | 34 +++++++++++ .../graphics-spice-qxl-vga.args | 32 ---------- .../graphics-spice-qxl-vga.x86_64-latest.args | 35 +++++++++++ .../qemuxml2argvdata/graphics-spice-sasl.args | 32 ---------- .../graphics-spice-sasl.x86_64-latest.args | 35 +++++++++++ .../graphics-spice-socket.args | 30 --------- .../graphics-spice-socket.x86_64-latest.args | 33 ++++++++++ .../graphics-spice-timeout.args | 36 ----------- .../graphics-spice-timeout.x86_64-latest.args | 38 ++++++++++++ .../graphics-spice-usb-redir.args | 38 ------------ ...raphics-spice-usb-redir.x86_64-latest.args | 41 +++++++++++++ tests/qemuxml2argvdata/graphics-spice.args | 32 ---------- .../graphics-spice.x86_64-latest.args | 35 +++++++++++ tests/qemuxml2argvtest.c | 61 ++++--------------- 25 files changed, 426 insertions(+), 423 deletions(-) delete mode 100644 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-agentmouse.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-spice-auto-socket-cfg.args => graphics-spice-auto-socket-cfg.x86_64-latest.args} (50%) rename tests/qemuxml2argvdata/{graphics-spice-auto-socket.args => graphics-spice-auto-socket.x86_64-latest.args} (50%) delete mode 100644 tests/qemuxml2argvdata/graphics-spice-compression.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-no-args.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-qxl-vga.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-socket.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-timeout.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-usb-redir.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice.args create mode 100644 tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args deleted file mode 100644 index 5a01f17ec4..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 \ --usb \ --spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer=on,seamless-migration=on \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ --device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.args new file mode 100644 index 0000000000..3bcfd55dae --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.args @@ -0,0 +1,35 @@ +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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer=on,seamless-migration=on \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","addr":"0x4"}' \ +-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-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args deleted file mode 100644 index 6e9aeb0878..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ --usb \ --chardev spicevmc,id=charchannel0,name=vdagent \ --device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \ --spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args new file mode 100644 index 0000000000..44d401da5b --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \ +-chardev spicevmc,id=charchannel0,name=vdagent \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \ +-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-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args similarity index 50% rename from tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args rename to tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args index 51d8ce8aa3..8cb5ffa4c3 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args @@ -6,25 +6,28 @@ 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=spice \ /usr/bin/qemu-system-i386 \ -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 \ +-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 \ --realtime mlock=off \ +-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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-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 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ -spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"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-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args similarity index 50% rename from tests/qemuxml2argvdata/graphics-spice-auto-socket.args rename to tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args index 51d8ce8aa3..8cb5ffa4c3 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args @@ -6,25 +6,28 @@ 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=spice \ /usr/bin/qemu-system-i386 \ -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 \ +-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 \ --realtime mlock=off \ +-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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-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 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ -spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ +-device '{"driver":"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-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args deleted file mode 100644 index fc5c8f97fb..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-compression.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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 \ --usb \ --spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,seamless-migration=on \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ --device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args new file mode 100644 index 0000000000..a73d882164 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args @@ -0,0 +1,35 @@ +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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,seamless-migration=on \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr":"0x4"}' \ +-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-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args deleted file mode 100644 index f0fb493a41..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 \ --usb \ --spice port=5903,addr=127.0.0.1,seamless-migration=on \ --display egl-headless \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args new file mode 100644 index 0000000000..74f39e9e10 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args @@ -0,0 +1,35 @@ +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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5903,addr=127.0.0.1,seamless-migration=on \ +-display egl-headless,rendernode=/dev/dri/foo \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"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-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args deleted file mode 100644 index 32da9284f8..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.args +++ /dev/null @@ -1,31 +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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 \ --usb \ --spice port=0,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args new file mode 100644 index 0000000000..19e18162fc --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args @@ -0,0 +1,34 @@ +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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=0,seamless-migration=on \ +-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-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args deleted file mode 100644 index 13144632d9..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 \ --usb \ --spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,seamless-migration=on \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ --device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args new file mode 100644 index 0000000000..8503eb36cb --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args @@ -0,0 +1,35 @@ +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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,seamless-migration=on \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr":"0x4"}' \ +-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-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args deleted file mode 100644 index 42cbbbb568..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.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=spice \ -SASL_CONF_PATH=/root/.sasl2 \ -/usr/bin/qemu-system-i386 \ --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 \ --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 \ --usb \ --spice port=5903,tls-port=5904,addr=127.0.0.1,sasl=on,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args new file mode 100644 index 0000000000..78dc8d3c8d --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args @@ -0,0 +1,35 @@ +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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,sasl=on,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"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-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args deleted file mode 100644 index 4e09935a69..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-socket.args +++ /dev/null @@ -1,30 +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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 \ --usb \ --spice unix,addr=/tmp/spice.sock,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args new file mode 100644 index 0000000000..4f04e1e86f --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-socket.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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice unix,addr=/tmp/spice.sock,seamless-migration=on \ +-device '{"driver":"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-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args deleted file mode 100644 index b1c5bb5c70..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-f14 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-f14/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-f14/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-f14/.config \ -QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i386 \ --name guest=f14,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-f14/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ --cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ --m 1024 \ --realtime mlock=off \ --smp 2,sockets=1,cores=2,threads=1 \ --uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-f14/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot menu=on,strict=on \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ --usb \ --netdev tap,fd=3,id=hostnet0 \ --device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \ --device usb-tablet,id=input0,bus=usb.0,port=1 \ --spice port=5900,addr=127.0.0.1,seamless-migration=on \ --device VGA,id=video0,bus=pci.0,addr=0x2 \ --device AC97,id=sound0,bus=pci.0,addr=0x3 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args new file mode 100644 index 0000000000..3a97fefc99 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-f14 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-f14/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-f14/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-f14/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=f14,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-f14/master-key.aes"}' \ +-machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \ +-overcommit mem-lock=off \ +-smp 2,sockets=1,dies=1,cores=2,threads=1 \ +-uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \ +-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 menu=on,strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \ +-netdev tap,fd=3,id=hostnet0 \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:71:70:89","bus":"pci.0","addr":"0x7"}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5900,addr=127.0.0.1,seamless-migration=on \ +-device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args deleted file mode 100644 index 06fa89b8f0..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args +++ /dev/null @@ -1,38 +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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \ --device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ --device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ --spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,seamless-migration=on \ --device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ --chardev socket,id=charredir0,host=localhost,port=4000 \ --device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \ --chardev spicevmc,id=charredir1,name=usbredir \ --device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args new file mode 100644 index 0000000000..32e555a129 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args @@ -0,0 +1,41 @@ +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 '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,seamless-migration=on \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \ +-chardev socket,id=charredir0,host=localhost,port=4000 \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":"usb.0","port":"1"}' \ +-chardev spicevmc,id=charredir1,name=usbredir \ +-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":"usb.0","port":"4"}' \ +-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-spice.args b/tests/qemuxml2argvdata/graphics-spice.args deleted file mode 100644 index f2b638fbbd..0000000000 --- a/tests/qemuxml2argvdata/graphics-spice.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=spice \ -/usr/bin/qemu-system-i386 \ --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 \ --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 \ --usb \ --spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,disable-agent-file-xfer=on,seamless-migration=on \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \ --device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args new file mode 100644 index 0000000000..58355bd0af --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args @@ -0,0 +1,35 @@ +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 '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev id=audio1,driver=spice \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,disable-agent-file-xfer=on,seamless-migration=on \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr":"0x4"}' \ +-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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1c59395203..a171a978bd 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1496,60 +1496,25 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("graphics-sdl-egl-headless"); DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SDL); - DO_TEST("graphics-spice", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("graphics-spice-no-args", - QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("graphics-spice"); + DO_TEST_CAPS_LATEST("graphics-spice-no-args"); driver.config->spiceSASL = 1; driver.config->spiceSASLdir = g_strdup("/root/.sasl2"); - DO_TEST("graphics-spice-sasl", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_CAPS_LATEST("graphics-spice-sasl"); VIR_FREE(driver.config->spiceSASLdir); driver.config->spiceSASL = 0; - DO_TEST("graphics-spice-agentmouse", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-spice-compression", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("graphics-spice-timeout", - QEMU_CAPS_KVM, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_DEVICE_VGA); - DO_TEST("graphics-spice-qxl-vga", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("graphics-spice-usb-redir", - QEMU_CAPS_SPICE, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_USB_REDIR, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-spice-agent-file-xfer", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("graphics-spice-socket", - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-spice-auto-socket", - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("graphics-spice-agentmouse"); + DO_TEST_CAPS_LATEST("graphics-spice-compression"); + DO_TEST_CAPS_LATEST("graphics-spice-timeout"); + DO_TEST_CAPS_LATEST("graphics-spice-qxl-vga"); + DO_TEST_CAPS_LATEST("graphics-spice-usb-redir"); + DO_TEST_CAPS_LATEST("graphics-spice-agent-file-xfer"); + DO_TEST_CAPS_LATEST("graphics-spice-socket"); + DO_TEST_CAPS_LATEST("graphics-spice-auto-socket"); driver.config->spiceAutoUnixSocket = true; - DO_TEST("graphics-spice-auto-socket-cfg", - QEMU_CAPS_SPICE, - QEMU_CAPS_SPICE_UNIX, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("graphics-spice-auto-socket-cfg"); driver.config->spiceAutoUnixSocket = false; - DO_TEST("graphics-spice-egl-headless", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_EGL_HEADLESS); + DO_TEST_CAPS_LATEST("graphics-spice-egl-headless"); DO_TEST_CAPS_LATEST_PARSE_ERROR("graphics-spice-invalid-egl-headless"); DO_TEST_CAPS_LATEST("graphics-spice-gl-auto-rendernode"); -- 2.31.1

It is now unused. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Tim Wiederhake <twiederh@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - 21 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 47b488213f..e4fdd9a1eb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -382,7 +382,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "qxl-vga.max_outputs", /* X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS */ /* 225 */ - "spice-unix", /* QEMU_CAPS_SPICE_UNIX */ + "spice-unix", /* X_QEMU_CAPS_SPICE_UNIX */ "drive-detect-zeroes", /* QEMU_CAPS_DRIVE_DETECT_ZEROES */ "tls-creds-x509", /* X_QEMU_CAPS_OBJECT_TLS_CREDS_X509 */ "display", /* X_QEMU_CAPS_DISPLAY */ @@ -3196,7 +3196,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX }, { "spice", "gl", QEMU_CAPS_SPICE_GL }, - { "spice", "unix", QEMU_CAPS_SPICE_UNIX }, { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL }, { "vnc", "audiodev", QEMU_CAPS_AUDIODEV }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2bca284e10..61bdbdb2ac 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -362,7 +362,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs= */ /* 225 */ - QEMU_CAPS_SPICE_UNIX, /* -spice unix */ + X_QEMU_CAPS_SPICE_UNIX, /* -spice unix */ QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes= */ X_QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */ X_QEMU_CAPS_DISPLAY, /* -display */ diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 559bf16766..ed9826504c 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -107,7 +107,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 745110142f..7f536db863 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 5acce281b1..24ebdf3bbf 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 92b3b10147..eedf55d677 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 98f1dc041c..9ae7a9260a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -85,7 +85,6 @@ <flag name='chardev-logfile'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='virtio-pci-disable-legacy'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 88d0219e36..cbfdf4968e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -85,7 +85,6 @@ <flag name='chardev-logfile'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='virtio-pci-disable-legacy'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 28643ca67d..2e5947aff6 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 7a38f44dea..40ad314d29 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index d3dde76939..415d12054b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index d8f9af8af2..58c7eb6651 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -85,7 +85,6 @@ <flag name='chardev-logfile'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='virtio-pci-disable-legacy'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 3e99e52962..69f49020e7 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index dcec7cfb16..58af90b29f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -31,7 +31,6 @@ <flag name='vserport-change-event'/> <flag name='spice-gl'/> <flag name='chardev-logfile'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='query-hotpluggable-cpus'/> <flag name='gluster.debug_level'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 18b7897bfa..578e16e8b0 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 29ea8b1b8c..a11d15f91a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -84,7 +84,6 @@ <flag name='chardev-logfile'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='virtio-pci-disable-legacy'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 923aa240ad..bcc262551a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 78ede15fb3..1b394198f1 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index cbdbed7f86..1f4f49eb34 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -104,7 +104,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index bb3a24b00f..9662214cd8 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -91,7 +91,6 @@ <flag name='pxb-pcie'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='virtio-pci-disable-legacy'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 519da73849..39179916c5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -104,7 +104,6 @@ <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='qxl.max_outputs'/> - <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='intel-iommu'/> <flag name='virtio-pci-disable-legacy'/> -- 2.31.1