NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Add qemuBufferEscapeComma

Browse Source 
Centralize the magic invocation for escaping commas on the qemu
command line, and document it a bit
This commit is contained in:
Cole Robinson 2016-05-08 14:22:13 -04:00
parent ef2c82170f
commit 53d976b63a
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_command.c
View File

@ -149,6 +149,22 @@ VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST,
"preferred", "preferred",
"interleave"); "interleave");
/**
* qemuBufferEscapeComma:
* @buf: buffer to append the escaped string
* @str: the string to escape
*
* qemu requires that any values passed on the command line which contain
* a ',' must escape it using an extra ',' as the escape character
*/
static void
qemuBufferEscapeComma(virBufferPtr buf, const char *str)
{
virBufferEscape(buf, ',', ",", "%s", str);
}
/** /**
* qemuBuildHasMasterKey: * qemuBuildHasMasterKey:
* @qemuCaps: QEMU binary capabilities * @qemuCaps: QEMU binary capabilities
@ -1211,7 +1227,8 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
break; break;
} }
virBufferEscape(&opt, ',', ",", "%s,", source); qemuBufferEscapeComma(&opt, source);
virBufferAddLit(&opt, ",");
if (disk->src->format > 0 && if (disk->src->format > 0 &&
disk->src->type != VIR_STORAGE_TYPE_DIR) disk->src->type != VIR_STORAGE_TYPE_DIR)
@ -3783,7 +3800,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
goto error; goto error;
} }
virBufferAsprintf(&buf, "virtio-input-host%s,id=%s,evdev=", suffix, dev->info.alias); virBufferAsprintf(&buf, "virtio-input-host%s,id=%s,evdev=", suffix, dev->info.alias);
virBufferEscape(&buf, ',', ",", "%s", dev->source.evdev); qemuBufferEscapeComma(&buf, dev->source.evdev);
break; break;
case VIR_DOMAIN_INPUT_TYPE_LAST: case VIR_DOMAIN_INPUT_TYPE_LAST:
break; break;
@ -9084,10 +9101,10 @@ qemuBuildTPMBackendStr(const virDomainDef *def,
goto error; goto error;
} }
virBufferAddLit(&buf, ",path="); virBufferAddLit(&buf, ",path=");
virBufferEscape(&buf, ',', ",", "%s", devset ? devset : tpmdev); qemuBufferEscapeComma(&buf, devset ? devset : tpmdev);
virBufferAddLit(&buf, ",cancel-path="); virBufferAddLit(&buf, ",cancel-path=");
virBufferEscape(&buf, ',', ",", "%s", cancel_path); qemuBufferEscapeComma(&buf, cancel_path);
VIR_FREE(devset); VIR_FREE(devset);
VIR_FREE(cancel_path); VIR_FREE(cancel_path);