提交 4b8faeb9 编写于 作者: J Ján Tomko

qemuBuildChrChardevStr: split attribute formatting

Remove repetition of the 'socket' device and its alias.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
上级 7c94eebf
...@@ -5195,6 +5195,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, ...@@ -5195,6 +5195,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
break; break;
case VIR_DOMAIN_CHR_TYPE_UNIX: case VIR_DOMAIN_CHR_TYPE_UNIX:
virBufferAsprintf(&buf, "socket,id=%s", charAlias);
if (dev->data.nix.listen && if (dev->data.nix.listen &&
(flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) && (flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) { virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) {
...@@ -5208,11 +5209,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, ...@@ -5208,11 +5209,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
if (fd < 0) if (fd < 0)
goto cleanup; goto cleanup;
virBufferAsprintf(&buf, "socket,id=%s,fd=%d", charAlias, fd); virBufferAsprintf(&buf, ",fd=%d", fd);
virCommandPassFD(cmd, fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); virCommandPassFD(cmd, fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
} else { } else {
virBufferAsprintf(&buf, "socket,id=%s,path=", charAlias); virBufferAddLit(&buf, ",path=");
virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path); virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path);
} }
if (dev->data.nix.listen) { if (dev->data.nix.listen) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册