Re: [libvirt] [PATCH 2/4] qemuBuildHostNetStr: do not start options with a comma

[Pavel Hrdina]

On Fri, Oct 14, 2016 at 04:32:16PM +0200, Ján Tomko wrote:
> Put the comma at the end and trim it later for consistency.
> ---

ACK

Pavel


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 2/4] qemuBuildHostNetStr: do not start options with a comma

[Ján Tomko]

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 eba7ba9..80ebe51 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3742,19 +3742,18 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
 }
 
 if (vlan >= 0) {
-virBufferAsprintf(, "vlan=%d", vlan);
+virBufferAsprintf(, "vlan=%d,", vlan);
 if (net->info.alias)
-virBufferAsprintf(, ",name=host%s",
-  net->info.alias);
+virBufferAsprintf(, "name=host%s,", net->info.alias);
 } else {
-virBufferAsprintf(, "id=host%s", net->info.alias);
+virBufferAsprintf(, "id=host%s,", net->info.alias);
 }
 
 if (is_tap) {
 if (vhostfdSize) {
-virBufferAddLit(, ",vhost=on,");
+virBufferAddLit(, "vhost=on,");
 if (vhostfdSize == 1) {
-virBufferAsprintf(, "vhostfd=%s", vhostfd[0]);
+virBufferAsprintf(, "vhostfd=%s,", vhostfd[0]);
 } else {
 virBufferAddLit(, "vhostfds=");
 for (i = 0; i < vhostfdSize; i++) {
@@ -3762,14 +3761,16 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
 virBufferAddChar(, ':');
 virBufferAdd(, vhostfd[i], -1);
 }
+virBufferAddChar(, ',');
 }
 }
 if (net->tune.sndbuf_specified)
-virBufferAsprintf(, ",sndbuf=%lu", net->tune.sndbuf);
+virBufferAsprintf(, "sndbuf=%lu,", net->tune.sndbuf);
 }
 
 virObjectUnref(cfg);
 
+virBufferTrim(, ",", -1);
 if (virBufferCheckError() < 0)
 return NULL;
 
-- 
2.7.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list