2:33 a.m.
Change to the boolean option "unix=on"
Signed-off-by: Han Han <hhan(a)redhat.com>
---
src/qemu/qemu_command.c | 2 +-
.../graphics-spice-auto-socket-cfg.x86_64-latest.args | 2 +-
.../graphics-spice-auto-socket.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/name-escape.x86_64-latest.args | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index b45a5e4f80..bc285c0b6f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8204,7 +8204,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig *cfg,
switch (glisten->type) {
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
- virBufferAddLit(&opt, "unix,addr=");
+ virBufferAddLit(&opt, "unix=on,addr=");
virQEMUBuildBufferEscapeComma(&opt, glisten->socket);
virBufferAddLit(&opt, ",");
hasInsecure = true;
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args
index a50ca802ae..03fa8e868a 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-audiodev
'{"id":"audio1","driver":"spice"}' \
--spice
unix,addr=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
+-spice
unix=on,addr=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/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-auto-socket.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args
index a50ca802ae..03fa8e868a 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-audiodev
'{"id":"audio1","driver":"spice"}' \
--spice
unix,addr=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
+-spice
unix=on,addr=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/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-socket.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args
index 634176a6c3..9c30cf6089 100644
--- a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-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 \
+-spice unix=on,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/name-escape.x86_64-latest.args
b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args
index 096a774caa..9eec8f5a9f 100644
--- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args
@@ -41,7 +41,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo=1,bar=2/.config \
-netdev
'{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:charchannel0"}],"id":"channel0"}'
\
-audiodev
'{"id":"audio1","driver":"spice"}' \
-vnc vnc=unix:/var/lib/libvirt/qemu/domain--1-foo=1,,bar=2/vnc.sock,audiodev=audio1 \
--spice
unix,addr=/var/lib/libvirt/qemu/domain--1-foo=1,,bar=2/spice.sock,gl=on,rendernode=/dev/dri/foo,,bar,seamless-migration=on
\
+-spice
unix=on,addr=/var/lib/libvirt/qemu/domain--1-foo=1,,bar=2/spice.sock,gl=on,rendernode=/dev/dri/foo,,bar,seamless-migration=on
\
-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
-blockdev
'{"driver":"iscsi","portal":"example.foo.org:3260","target":"iqn.1992-01.com.example:my,storage","lun":1,"transport":"tcp","node-name":"libvirt-2-backend","read-only":false}'
\
-device
'{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostdev0","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":4}'
\
--
2.43.0