External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-09 09:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: vhost-user-fs: separate building of chardev string

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2021-08-17 16:12:50 +02:00
parent ebdcb2a900
commit 387e265f90
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_command.c
View File

@ -2033,6 +2033,20 @@ qemuBuildDisksCommandLine(virCommand *cmd,
}
static char *
qemuBuildVHostUserFsChardevStr(const virDomainFSDef *fs,
const char *chardev_alias)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virBufferAddLit(&buf, "socket");
virBufferAsprintf(&buf, ",id=%s", chardev_alias);
virBufferAddLit(&buf, ",path=");
virQEMUBuildBufferEscapeComma(&buf, QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock);
return virBufferContentAndReset(&buf);
}
static int
qemuBuildVHostUserFsCommandLine(virCommand *cmd,
virDomainFSDef *fs,
@ -2040,16 +2054,14 @@ qemuBuildVHostUserFsCommandLine(virCommand *cmd,
qemuDomainObjPrivate *priv)
{
g_autofree char *chardev_alias = NULL;
g_autofree char *chrdevstr = NULL;
g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER;
chardev_alias = qemuDomainGetVhostUserChrAlias(fs->info.alias);
chrdevstr = qemuBuildVHostUserFsChardevStr(fs, chardev_alias);
virCommandAddArg(cmd, "-chardev");
virBufferAddLit(&opt, "socket");
virBufferAsprintf(&opt, ",id=%s", chardev_alias);
virBufferAddLit(&opt, ",path=");
virQEMUBuildBufferEscapeComma(&opt, QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock);
virCommandAddArgBuffer(cmd, &opt);
virCommandAddArg(cmd, chrdevstr);
virCommandAddArg(cmd, "-device");