mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-20 07:59:00 +00:00
qemu: command: escape commas in VM name
This isn't sufficient on its own, since the VM name is used for things like monitor paths, which we don't escape yet
This commit is contained in:
parent
53d976b63a
commit
0f377eb1b0
@ -6867,7 +6867,7 @@ qemuBuildNameCommandLine(virCommandPtr cmd,
|
||||
|
||||
virCommandAddArg(cmd, "-name");
|
||||
|
||||
virBufferAsprintf(&buf, "%s", def->name);
|
||||
qemuBufferEscapeComma(&buf, def->name);
|
||||
|
||||
if (cfg->setProcessName &&
|
||||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_NAME_PROCESS))
|
||||
|
24
tests/qemuxml2argvdata/qemuxml2argv-name-escape.args
Normal file
24
tests/qemuxml2argvdata/qemuxml2argv-name-escape.args
Normal file
@ -0,0 +1,24 @@
|
||||
LC_ALL=C \
|
||||
PATH=/bin \
|
||||
HOME=/home/test \
|
||||
USER=test \
|
||||
LOGNAME=test \
|
||||
QEMU_AUDIO_DRV=none \
|
||||
/usr/bin/qemu \
|
||||
-name foo,,bar,debug-threads=on \
|
||||
-S \
|
||||
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo,\
|
||||
bar/master-key.aes \
|
||||
-M pc \
|
||||
-m 214 \
|
||||
-smp 1 \
|
||||
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||
-nographic \
|
||||
-nodefaults \
|
||||
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo,bar/monitor.sock,\
|
||||
server,nowait \
|
||||
-mon chardev=charmonitor,id=monitor,mode=readline \
|
||||
-no-acpi \
|
||||
-boot c \
|
||||
-usb \
|
||||
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
18
tests/qemuxml2argvdata/qemuxml2argv-name-escape.xml
Normal file
18
tests/qemuxml2argvdata/qemuxml2argv-name-escape.xml
Normal file
@ -0,0 +1,18 @@
|
||||
<domain type='qemu'>
|
||||
<name>foo,bar</name>
|
||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||
<memory unit='KiB'>219100</memory>
|
||||
<currentMemory unit='KiB'>219100</currentMemory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='i686' machine='pc'>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu</emulator>
|
||||
</devices>
|
||||
</domain>
|
@ -1902,6 +1902,8 @@ mymain(void)
|
||||
VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS,
|
||||
NONE);
|
||||
|
||||
DO_TEST("name-escape", QEMU_CAPS_NAME_DEBUG_THREADS,
|
||||
QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_CHARDEV);
|
||||
DO_TEST("debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS);
|
||||
|
||||
DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET);
|
||||
|
Loading…
x
Reference in New Issue
Block a user