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: use a separate buffer for the subelements of <controller>

Browse Source 
We need to decide whether to format <controller> as a single tag
or if it has any subelements.

Rewrite the function to use a separate buffer for subelements,
to make adding new options easier.
This commit is contained in:
Ján Tomko 2017-05-26 17:53:54 +02:00
parent fe262186dc
commit 5b96f37ff4
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/conf/domain_conf.c
View File

@ -21410,6 +21410,9 @@ 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 childBuf = VIR_BUFFER_INITIALIZER;
virBufferAdjustIndent(&childBuf, virBufferGetIndent(buf, false) + 2);
if (!type) { if (!type) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -21475,7 +21478,6 @@ virDomainControllerDefFormat(virBufferPtr buf,
def->iothread || def->iothread ||
virDomainDeviceInfoNeedsFormat(&def->info, flags) || pcihole64) { virDomainDeviceInfoNeedsFormat(&def->info, flags) || pcihole64) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
if (pciModel) { if (pciModel) {
modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName); modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName);
@ -21485,47 +21487,47 @@ virDomainControllerDefFormat(virBufferPtr buf,
def->opts.pciopts.modelName); def->opts.pciopts.modelName);
return -1; return -1;
} }
virBufferAsprintf(buf, "<model name='%s'/>\n", modelName); virBufferAsprintf(&childBuf, "<model name='%s'/>\n", modelName);
} }
if (pciTarget) { if (pciTarget) {
virBufferAddLit(buf, "<target"); virBufferAddLit(&childBuf, "<target");
if (def->opts.pciopts.chassisNr != -1) if (def->opts.pciopts.chassisNr != -1)
virBufferAsprintf(buf, " chassisNr='%d'", virBufferAsprintf(&childBuf, " chassisNr='%d'",
def->opts.pciopts.chassisNr); def->opts.pciopts.chassisNr);
if (def->opts.pciopts.chassis != -1) if (def->opts.pciopts.chassis != -1)
virBufferAsprintf(buf, " chassis='%d'", virBufferAsprintf(&childBuf, " chassis='%d'",
def->opts.pciopts.chassis); def->opts.pciopts.chassis);
if (def->opts.pciopts.port != -1) if (def->opts.pciopts.port != -1)
virBufferAsprintf(buf, " port='0x%x'", virBufferAsprintf(&childBuf, " port='0x%x'",
def->opts.pciopts.port); def->opts.pciopts.port);
if (def->opts.pciopts.busNr != -1) if (def->opts.pciopts.busNr != -1)
virBufferAsprintf(buf, " busNr='%d'", virBufferAsprintf(&childBuf, " busNr='%d'",
def->opts.pciopts.busNr); def->opts.pciopts.busNr);
if (def->opts.pciopts.numaNode == -1) { if (def->opts.pciopts.numaNode == -1) {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(&childBuf, "/>\n");
} else { } else {
virBufferAddLit(buf, ">\n"); virBufferAddLit(&childBuf, ">\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(&childBuf, 2);
virBufferAsprintf(buf, "<node>%d</node>\n", virBufferAsprintf(&childBuf, "<node>%d</node>\n",
def->opts.pciopts.numaNode); def->opts.pciopts.numaNode);
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(&childBuf, -2);
virBufferAddLit(buf, "</target>\n"); virBufferAddLit(&childBuf, "</target>\n");
} }
} }
virDomainControllerDriverFormat(buf, def); virDomainControllerDriverFormat(&childBuf, def);
if (virDomainDeviceInfoNeedsFormat(&def->info, flags) && if (virDomainDeviceInfoNeedsFormat(&def->info, flags) &&
virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0)
return -1; return -1;
if (pcihole64) { if (pcihole64) {
virBufferAsprintf(buf, "<pcihole64 unit='KiB'>%lu</" virBufferAsprintf(&childBuf, "<pcihole64 unit='KiB'>%lu</"
"pcihole64>\n", def->opts.pciopts.pcihole64size); "pcihole64>\n", def->opts.pciopts.pcihole64size);
} }
virBufferAdjustIndent(buf, -2); virBufferAddBuffer(buf, &childBuf);
virBufferAddLit(buf, "</controller>\n"); virBufferAddLit(buf, "</controller>\n");
} else { } else {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");