From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 3 Oct 2018 14:08:56 +0000 (+0200)
Subject: qemuBuildChrChardevStr: split attribute formatting
X-Git-Tag: v4.10.0-rc1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b8faeb9fe9c650f867dd38d2a7dfc3ad335ac41;p=thirdparty%2Flibvirt.git

qemuBuildChrChardevStr: split attribute formatting

Remove repetition of the 'socket' device and its alias.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e338d3172e..8abbd1922c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5195,6 +5195,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
         break;
 
     case VIR_DOMAIN_CHR_TYPE_UNIX:
+        virBufferAsprintf(&buf, "socket,id=%s", charAlias);
         if (dev->data.nix.listen &&
             (flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) &&
             virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) {
@@ -5208,11 +5209,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
             if (fd < 0)
                 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);
         } else {
-            virBufferAsprintf(&buf, "socket,id=%s,path=", charAlias);
+            virBufferAddLit(&buf, ",path=");
             virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path);
         }
         if (dev->data.nix.listen) {