External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildHostNetStr: do not start options with a comma

Browse Source 
Put the comma at the end and trim it later for consistency.
This commit is contained in:
Ján Tomko 2016-10-14 16:23:18 +02:00
parent c70c56ded0
commit b2b670f80f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_command.c
View File

@ -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;