External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-28 08:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: introduce virDomainControllerDriverFormat

Browse Source 
Split out formatting the <driver> subelement of <controller>
to make adding new options easier.
This commit is contained in:
Ján Tomko 2017-05-26 17:47:50 +02:00
parent 6d12a1cb2f
commit fe262186dc
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/conf/domain_conf.c
View File

@ -21370,6 +21370,37 @@ virDomainDiskDefFormat(virBufferPtr buf,
#undef FORMAT_IOTUNE #undef FORMAT_IOTUNE
static void
virDomainControllerDriverFormat(virBufferPtr buf,
virDomainControllerDefPtr def)
{
virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
if (def->queues)
virBufferAsprintf(&driverBuf, " queues='%u'", def->queues);
if (def->cmd_per_lun)
virBufferAsprintf(&driverBuf, " cmd_per_lun='%u'", def->cmd_per_lun);
if (def->max_sectors)
virBufferAsprintf(&driverBuf, " max_sectors='%u'", def->max_sectors);
if (def->ioeventfd) {
virBufferAsprintf(&driverBuf, " ioeventfd='%s'",
virTristateSwitchTypeToString(def->ioeventfd));
}
if (def->iothread)
virBufferAsprintf(&driverBuf, " iothread='%u'", def->iothread);
if (virBufferUse(&driverBuf)) {
virBufferAddLit(buf, "<driver");
virBufferAddBuffer(buf, &driverBuf);
virBufferAddLit(buf, "/>\n");
}
}
static int static int
virDomainControllerDefFormat(virBufferPtr buf, virDomainControllerDefFormat(virBufferPtr buf,
virDomainControllerDefPtr def, virDomainControllerDefPtr def,
@ -21379,7 +21410,6 @@ virDomainControllerDefFormat(virBufferPtr buf,
const char *model = NULL; const char *model = NULL;
const char *modelName = NULL; const char *modelName = NULL;
bool pcihole64 = false, pciModel = false, pciTarget = false; bool pcihole64 = false, pciModel = false, pciTarget = false;
virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
if (!type) { if (!type) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -21484,28 +21514,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
} }
} }
if (def->queues) virDomainControllerDriverFormat(buf, def);
virBufferAsprintf(&driverBuf, " queues='%u'", def->queues);
if (def->cmd_per_lun)
virBufferAsprintf(&driverBuf, " cmd_per_lun='%u'", def->cmd_per_lun);
if (def->max_sectors)
virBufferAsprintf(&driverBuf, " max_sectors='%u'", def->max_sectors);
if (def->ioeventfd) {
virBufferAsprintf(&driverBuf, " ioeventfd='%s'",
virTristateSwitchTypeToString(def->ioeventfd));
}
if (def->iothread)
virBufferAsprintf(&driverBuf, " iothread='%u'", def->iothread);
if (virBufferUse(&driverBuf)) {
virBufferAddLit(buf, "<driver");
virBufferAddBuffer(buf, &driverBuf);
virBufferAddLit(buf, "/>\n");
}
if (virDomainDeviceInfoNeedsFormat(&def->info, flags) && if (virDomainDeviceInfoNeedsFormat(&def->info, flags) &&
virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags) < 0)