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(-)
Change to the boolean option "unix=on"
Signed-off-by: Han Han <hhan@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
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
On 12/21/23 09:33, Han Han wrote: > Change to the boolean option "unix=on" > > Signed-off-by: Han Han <hhan@redhat.com> > --- And just for next time: please do insert a link to corresponding gitlab issue. For instance: Change the boolean option "unix=on". Resolves: https://gitlab.com/libvirt/libvirt/-/issues/573 Signed-off-by: .... This has two advantages: 1) We know there is an issue associated (and perhaps can find more info, though in this case it's pretty obvious), 2) gitlab SHOULD close the issue automatically once the commit is merged, though this feature it broken for some time: https://gitlab.com/gitlab-org/gitlab/-/issues/389801 Happy hacking! Michal _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org
On a Thursday in 2023, Michal Prívozník wrote: >On 12/21/23 09:33, Han Han wrote: >> Change to the boolean option "unix=on" >> >> Signed-off-by: Han Han <hhan@redhat.com> >> --- > >And just for next time: please do insert a link to corresponding gitlab >issue. For instance: > >Change the boolean option "unix=on". > >Resolves: https://gitlab.com/libvirt/libvirt/-/issues/573 >Signed-off-by: .... > >This has two advantages: > >1) We know there is an issue associated (and perhaps can find more info, >though in this case it's pretty obvious), > I was not aware there was an issue filed for this, otherwise I would have included the link. >2) gitlab SHOULD close the issue automatically once the commit is >merged, though this feature it broken for some time: > > https://gitlab.com/gitlab-org/gitlab/-/issues/389801 'Fixes:' works for auto-closing. If you don't want to mislead the reader and instead want to close the issue with a commit that does not necessarily fix the issue, 'Closes:' also works. Jano > >Happy hacking! > >Michal >_______________________________________________ >Devel mailing list -- devel@lists.libvirt.org >To unsubscribe send an email to devel-leave@lists.libvirt.org _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org
On 12/21/23 13:30, Ján Tomko wrote: > On a Thursday in 2023, Michal Prívozník wrote: >> On 12/21/23 09:33, Han Han wrote: >>> Change to the boolean option "unix=on" >>> >>> Signed-off-by: Han Han <hhan@redhat.com> >>> --- >> >> And just for next time: please do insert a link to corresponding gitlab >> issue. For instance: >> >> Change the boolean option "unix=on". >> >> Resolves: https://gitlab.com/libvirt/libvirt/-/issues/573 >> Signed-off-by: .... >> >> This has two advantages: >> >> 1) We know there is an issue associated (and perhaps can find more info, >> though in this case it's pretty obvious), >> > > I was not aware there was an issue filed for this, otherwise I would > have included the link. > >> 2) gitlab SHOULD close the issue automatically once the commit is >> merged, though this feature it broken for some time: >> >> https://gitlab.com/gitlab-org/gitlab/-/issues/389801 > > > 'Fixes:' works for auto-closing. If you don't want to mislead the reader > and instead want to close the issue with a commit that does not > necessarily fix the issue, 'Closes:' also works. Yes, there are several options, either of which should close the issue [1]. From my experience, 'Closes' is usually used with MRs. And we tend to use 'Fixes' with reference to other commits that broke something. 1: https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically Michal _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org
On a Thursday in 2023, Han Han wrote:
>Change to the boolean option "unix=on"
>
Deprecated by QEMU commit:
commit ccd3b3b8112b670fdccf8a392b8419b173ffccb4
Author: Paolo Bonzini <pbonzini@redhat.com>
CommitDate: 2021-01-23 15:55:08 -0500
qemu-option: warn for short-form boolean options
The "unix=on" variant was supported even at the time of introduction of
the unix option in:
commit fe4831b1e7e7007ae15ae0470a06898660ab3877
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
CommitDate: 2015-01-22 11:18:41 +0100
spice: add unix address support
>Signed-off-by: Han Han <hhan@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(-)
>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(I will push it after the pipeline succeeds)
Jano
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
© 2016 - 2024 Red Hat, Inc.