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

qemuBuildHostNetStr: do not start options with a comma

Put the comma at the end and trim it later for consistency.
上级 c70c56de
...@@ -3742,19 +3742,18 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, ...@@ -3742,19 +3742,18 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
} }
if (vlan >= 0) { if (vlan >= 0) {
virBufferAsprintf(&buf, "vlan=%d", vlan); virBufferAsprintf(&buf, "vlan=%d,", vlan);
if (net->info.alias) if (net->info.alias)
virBufferAsprintf(&buf, ",name=host%s", virBufferAsprintf(&buf, "name=host%s,", net->info.alias);
net->info.alias);
} else { } else {
virBufferAsprintf(&buf, "id=host%s", net->info.alias); virBufferAsprintf(&buf, "id=host%s,", net->info.alias);
} }
if (is_tap) { if (is_tap) {
if (vhostfdSize) { if (vhostfdSize) {
virBufferAddLit(&buf, ",vhost=on,"); virBufferAddLit(&buf, "vhost=on,");
if (vhostfdSize == 1) { if (vhostfdSize == 1) {
virBufferAsprintf(&buf, "vhostfd=%s", vhostfd[0]); virBufferAsprintf(&buf, "vhostfd=%s,", vhostfd[0]);
} else { } else {
virBufferAddLit(&buf, "vhostfds="); virBufferAddLit(&buf, "vhostfds=");
for (i = 0; i < vhostfdSize; i++) { for (i = 0; i < vhostfdSize; i++) {
...@@ -3762,14 +3761,16 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, ...@@ -3762,14 +3761,16 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
virBufferAddChar(&buf, ':'); virBufferAddChar(&buf, ':');
virBufferAdd(&buf, vhostfd[i], -1); virBufferAdd(&buf, vhostfd[i], -1);
} }
virBufferAddChar(&buf, ',');
} }
} }
if (net->tune.sndbuf_specified) if (net->tune.sndbuf_specified)
virBufferAsprintf(&buf, ",sndbuf=%lu", net->tune.sndbuf); virBufferAsprintf(&buf, "sndbuf=%lu,", net->tune.sndbuf);
} }
virObjectUnref(cfg); virObjectUnref(cfg);
virBufferTrim(&buf, ",", -1);
if (virBufferCheckError(&buf) < 0) if (virBufferCheckError(&buf) < 0)
return NULL; return NULL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册