提交 077ba956 编写于 作者: C Cole Robinson

qemu: command: escape commas in VNC socket path

This path can be dependent on the VM libdir, which contains its name
上级 3153ac08
...@@ -7425,7 +7425,8 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, ...@@ -7425,7 +7425,8 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
graphics->data.vnc.socketAutogenerated = true; graphics->data.vnc.socketAutogenerated = true;
} }
virBufferAsprintf(&opt, "unix:%s", graphics->data.vnc.socket); virBufferAddLit(&opt, "unix:");
qemuBufferEscapeComma(&opt, graphics->data.vnc.socket);
} else { } else {
if (!graphics->data.vnc.autoport && if (!graphics->data.vnc.autoport &&
......
...@@ -13,7 +13,6 @@ bar/master-key.aes \ ...@@ -13,7 +13,6 @@ bar/master-key.aes \
-m 214 \ -m 214 \
-smp 1 \ -smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \ -nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo,bar/monitor.sock,\ -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo,bar/monitor.sock,\
server,nowait \ server,nowait \
...@@ -21,4 +20,6 @@ server,nowait \ ...@@ -21,4 +20,6 @@ server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-vnc unix:/tmp/bar,,foo.sock \
-vga cirrus \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
...@@ -14,5 +14,6 @@ ...@@ -14,5 +14,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu</emulator> <emulator>/usr/bin/qemu</emulator>
<graphics type='vnc' socket='/tmp/bar,foo.sock'/>
</devices> </devices>
</domain> </domain>
...@@ -1903,7 +1903,7 @@ mymain(void) ...@@ -1903,7 +1903,7 @@ mymain(void)
NONE); NONE);
DO_TEST("name-escape", QEMU_CAPS_NAME_DEBUG_THREADS, DO_TEST("name-escape", QEMU_CAPS_NAME_DEBUG_THREADS,
QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_CHARDEV); QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_CHARDEV, QEMU_CAPS_VNC);
DO_TEST("debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS); DO_TEST("debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS);
DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET); DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册