From b2b670f80ff42c63e012a6a6dbe8122b3dd24eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Fri, 14 Oct 2016 16:23:18 +0200
Subject: [PATCH] qemuBuildHostNetStr: do not start options with a comma

Put the comma at the end and trim it later for consistency.
---
 src/qemu/qemu_command.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1440d32aec..76c5bcb4f9 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3742,19 +3742,18 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
     }
 
     if (vlan >= 0) {
-        virBufferAsprintf(&buf, "vlan=%d", vlan);
+        virBufferAsprintf(&buf, "vlan=%d,", vlan);
         if (net->info.alias)
-            virBufferAsprintf(&buf, ",name=host%s",
-                              net->info.alias);
+            virBufferAsprintf(&buf, "name=host%s,", net->info.alias);
     } else {
-        virBufferAsprintf(&buf, "id=host%s", net->info.alias);
+        virBufferAsprintf(&buf, "id=host%s,", net->info.alias);
     }
 
     if (is_tap) {
         if (vhostfdSize) {
-            virBufferAddLit(&buf, ",vhost=on,");
+            virBufferAddLit(&buf, "vhost=on,");
             if (vhostfdSize == 1) {
-                virBufferAsprintf(&buf, "vhostfd=%s", vhostfd[0]);
+                virBufferAsprintf(&buf, "vhostfd=%s,", vhostfd[0]);
             } else {
                 virBufferAddLit(&buf, "vhostfds=");
                 for (i = 0; i < vhostfdSize; i++) {
@@ -3762,14 +3761,16 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
                         virBufferAddChar(&buf, ':');
                     virBufferAdd(&buf, vhostfd[i], -1);
                 }
+                virBufferAddChar(&buf, ',');
             }
         }
         if (net->tune.sndbuf_specified)
-            virBufferAsprintf(&buf, ",sndbuf=%lu", net->tune.sndbuf);
+            virBufferAsprintf(&buf, "sndbuf=%lu,", net->tune.sndbuf);
     }
 
     virObjectUnref(cfg);
 
+    virBufferTrim(&buf, ",", -1);
     if (virBufferCheckError(&buf) < 0)
         return NULL;
 
-- 
GitLab