External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Escape commas for qemuBuildDiskThrottling

Browse Source 
Add comma escaping for disk->blkdeviotune.group_name.

Signed-off-by: Anya Harter <aharter@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Anya Harter 2018-06-19 12:20:18 -04:00 committed by John Ferlan
parent fd51ab5f11
commit 1136fd4ebe
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_command.c
View File

@ -1554,8 +1554,8 @@ qemuBuildDiskThrottling(virDomainDiskDefPtr disk,
IOTUNE_ADD(size_iops_sec, "iops-size"); IOTUNE_ADD(size_iops_sec, "iops-size");
if (disk->blkdeviotune.group_name) { if (disk->blkdeviotune.group_name) {
virBufferEscapeString(buf, ",throttling.group=%s", virBufferAddLit(buf, ",throttling.group=");
disk->blkdeviotune.group_name); virQEMUBuildBufferEscapeComma(buf, disk->blkdeviotune.group_name);
} }
IOTUNE_ADD(total_bytes_sec_max_length, "bps-total-max-length"); IOTUNE_ADD(total_bytes_sec_max_length, "bps-total-max-length");

5
tests/qemuxml2argvdata/name-escape.args
View File

@ -24,6 +24,11 @@ bar=2/monitor.sock,server,nowait \
-boot c \ -boot c \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \ -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
cache=none,throttling.bps-total=5000,throttling.iops-total=6000,\
throttling.bps-total-max=10000,throttling.iops-total-max=11000,\
throttling.group=libvirt_iotune_group1,,foo \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-device ccid-card-emulated,backend=certificates,cert1=cert1,,foo,cert2=cert2,\ -device ccid-card-emulated,backend=certificates,cert1=cert1,,foo,cert2=cert2,\
cert3=cert3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \ cert3=cert3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \
-chardev tty,id=charserial0,path=/dev/ttyS2,,foo \ -chardev tty,id=charserial0,path=/dev/ttyS2,,foo \

13
tests/qemuxml2argvdata/name-escape.xml
View File

@ -14,6 +14,19 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<iotune>
<total_bytes_sec>5000</total_bytes_sec>
<total_iops_sec>6000</total_iops_sec>
<total_bytes_sec_max>10000</total_bytes_sec_max>
<total_iops_sec_max>11000</total_iops_sec_max>
<group_name>libvirt_iotune_group1,foo</group_name>
</iotune>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<graphics type='vnc'> <graphics type='vnc'>
<listen type='socket'/> <listen type='socket'/>
</graphics> </graphics>

2
tests/qemuxml2argvtest.c
View File

@ -2758,6 +2758,8 @@ mymain(void)
DO_TEST("name-escape", DO_TEST("name-escape",
QEMU_CAPS_NAME_DEBUG_THREADS, QEMU_CAPS_NAME_DEBUG_THREADS,
QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_OBJECT_SECRET,
QEMU_CAPS_DRIVE_IOTUNE_MAX,
QEMU_CAPS_DRIVE_IOTUNE_GROUP,
QEMU_CAPS_VNC, QEMU_CAPS_VNC,
QEMU_CAPS_NAME_GUEST, QEMU_CAPS_NAME_GUEST,
QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DEVICE_CIRRUS_VGA,