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

virDomainControllerDefFormat: do not mix attributes and subelements

Browse Source 
Move out the PCI controller's subelements formatting out of the switch
handling attributes. This removes the need for a few bool variables.
This commit is contained in:
Ján Tomko 2017-06-06 13:12:05 +02:00
parent 583022e52e
commit e146264aaa
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/conf/domain_conf.c
View File

@ -21415,7 +21415,6 @@ virDomainControllerDefFormat(virBufferPtr buf,
const char *type = virDomainControllerTypeToString(def->type); const char *type = virDomainControllerTypeToString(def->type);
const char *model = NULL; const char *model = NULL;
const char *modelName = NULL; const char *modelName = NULL;
bool pcihole64 = false, pciModel = false, pciTarget = false;
virBuffer childBuf = VIR_BUFFER_INITIALIZER; virBuffer childBuf = VIR_BUFFER_INITIALIZER;
virBufferAdjustIndent(&childBuf, virBufferGetIndent(buf, false) + 2); virBufferAdjustIndent(&childBuf, virBufferGetIndent(buf, false) + 2);
@ -21462,25 +21461,12 @@ virDomainControllerDefFormat(virBufferPtr buf,
} }
break; break;
case VIR_DOMAIN_CONTROLLER_TYPE_PCI:
if (def->opts.pciopts.pcihole64)
pcihole64 = true;
if (def->opts.pciopts.modelName != VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE)
pciModel = true;
if (def->opts.pciopts.chassisNr != -1 ||
def->opts.pciopts.chassis != -1 ||
def->opts.pciopts.port != -1 ||
def->opts.pciopts.busNr != -1 ||
def->opts.pciopts.numaNode != -1)
pciTarget = true;
break;
default: default:
break; break;
} }
if (pciModel || pciTarget) { if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
if (pciModel) { if (def->opts.pciopts.modelName != VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE) {
modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName); modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName);
if (!modelName) { if (!modelName) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -21491,7 +21477,11 @@ virDomainControllerDefFormat(virBufferPtr buf,
virBufferAsprintf(&childBuf, "<model name='%s'/>\n", modelName); virBufferAsprintf(&childBuf, "<model name='%s'/>\n", modelName);
} }
if (pciTarget) { if (def->opts.pciopts.chassisNr != -1 ||
def->opts.pciopts.chassis != -1 ||
def->opts.pciopts.port != -1 ||
def->opts.pciopts.busNr != -1 ||
def->opts.pciopts.numaNode != -1) {
virBufferAddLit(&childBuf, "<target"); virBufferAddLit(&childBuf, "<target");
if (def->opts.pciopts.chassisNr != -1) if (def->opts.pciopts.chassisNr != -1)
virBufferAsprintf(&childBuf, " chassisNr='%d'", virBufferAsprintf(&childBuf, " chassisNr='%d'",
@ -21524,7 +21514,8 @@ virDomainControllerDefFormat(virBufferPtr buf,
virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0)
return -1; return -1;
if (pcihole64) { if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
def->opts.pciopts.pcihole64) {
virBufferAsprintf(&childBuf, "<pcihole64 unit='KiB'>%lu</" virBufferAsprintf(&childBuf, "<pcihole64 unit='KiB'>%lu</"
"pcihole64>\n", def->opts.pciopts.pcihole64size); "pcihole64>\n", def->opts.pciopts.pcihole64size);
} }