External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: split out virtio net driver formatting

Browse Source 
Instead of checking upfront if the <driver> element will be needed
in a big condition, just format all the attributes into a string
and output the <driver> element if the string is not empty.
This commit is contained in:
Ján Tomko 2014-09-10 19:12:54 +02:00
parent 76a81b1d31
commit fb78d1cee7
1 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/conf/domain_conf.c
View File

@ -16484,6 +16484,41 @@ virDomainActualNetDefFormat(virBufferPtr buf,
return 0; return 0;
} }
static int
virDomainVirtioNetDriverFormat(char **outstr,
virDomainNetDefPtr def)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
if (def->driver.virtio.name) {
virBufferAsprintf(&buf, "name='%s' ",
virDomainNetBackendTypeToString(def->driver.virtio.name));
}
if (def->driver.virtio.txmode) {
virBufferAsprintf(&buf, "txmode='%s' ",
virDomainNetVirtioTxModeTypeToString(def->driver.virtio.txmode));
}
if (def->driver.virtio.ioeventfd) {
virBufferAsprintf(&buf, "ioeventfd='%s' ",
virTristateSwitchTypeToString(def->driver.virtio.ioeventfd));
}
if (def->driver.virtio.event_idx) {
virBufferAsprintf(&buf, "event_idx='%s' ",
virTristateSwitchTypeToString(def->driver.virtio.event_idx));
}
if (def->driver.virtio.queues)
virBufferAsprintf(&buf, "queues='%u' ", def->driver.virtio.queues);
virBufferTrim(&buf, " ", -1);
if (virBufferCheckError(&buf) < 0)
return -1;
*outstr = virBufferContentAndReset(&buf);
return 0;
}
int int
virDomainNetDefFormat(virBufferPtr buf, virDomainNetDefFormat(virBufferPtr buf,
virDomainNetDefPtr def, virDomainNetDefPtr def,
@ -16659,30 +16694,15 @@ virDomainNetDefFormat(virBufferPtr buf,
if (def->model) { if (def->model) {
virBufferEscapeString(buf, "<model type='%s'/>\n", virBufferEscapeString(buf, "<model type='%s'/>\n",
def->model); def->model);
if (STREQ(def->model, "virtio") && if (STREQ(def->model, "virtio")) {
(def->driver.virtio.name || def->driver.virtio.txmode || char *str;
def->driver.virtio.ioeventfd || def->driver.virtio.event_idx ||
def->driver.virtio.queues)) { if (virDomainVirtioNetDriverFormat(&str, def) < 0)
virBufferAddLit(buf, "<driver"); return -1;
if (def->driver.virtio.name) {
virBufferAsprintf(buf, " name='%s'", if (str)
virDomainNetBackendTypeToString(def->driver.virtio.name)); virBufferAsprintf(buf, "<driver %s/>\n", str);
} VIR_FREE(str);
if (def->driver.virtio.txmode) {
virBufferAsprintf(buf, " txmode='%s'",
virDomainNetVirtioTxModeTypeToString(def->driver.virtio.txmode));
}
if (def->driver.virtio.ioeventfd) {
virBufferAsprintf(buf, " ioeventfd='%s'",
virTristateSwitchTypeToString(def->driver.virtio.ioeventfd));
}
if (def->driver.virtio.event_idx) {
virBufferAsprintf(buf, " event_idx='%s'",
virTristateSwitchTypeToString(def->driver.virtio.event_idx));
}
if (def->driver.virtio.queues)
virBufferAsprintf(buf, " queues='%u'", def->driver.virtio.queues);
virBufferAddLit(buf, "/>\n");
} }
} }
if (def->filter) { if (def->filter) {