External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a separate buffer for <watchdog> subelements

Browse Source 
Convert virDomainWatchdogDefFormat to use a separate
buffer for subelements.
This commit is contained in:
Ján Tomko 2017-06-27 16:28:06 +02:00
parent a0d43268ca
commit cc7368e962
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/domain_conf.c
View File

@ -23291,6 +23291,9 @@ virDomainWatchdogDefFormat(virBufferPtr buf,
{ {
const char *model = virDomainWatchdogModelTypeToString(def->model); const char *model = virDomainWatchdogModelTypeToString(def->model);
const char *action = virDomainWatchdogActionTypeToString(def->action); const char *action = virDomainWatchdogActionTypeToString(def->action);
virBuffer childBuf = VIR_BUFFER_INITIALIZER;
virBufferAdjustIndent(&childBuf, virBufferGetIndent(buf, false) + 2);
if (!model) { if (!model) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -23304,15 +23307,18 @@ virDomainWatchdogDefFormat(virBufferPtr buf,
return -1; return -1;
} }
if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0)
return -1;
if (virBufferCheckError(&childBuf) < 0)
return -1;
virBufferAsprintf(buf, "<watchdog model='%s' action='%s'", virBufferAsprintf(buf, "<watchdog model='%s' action='%s'",
model, action); model, action);
if (virDomainDeviceInfoNeedsFormat(&def->info, flags)) { if (virBufferUse(&childBuf)) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2); virBufferAddBuffer(buf, &childBuf);
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0)
return -1;
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</watchdog>\n"); virBufferAddLit(buf, "</watchdog>\n");
} else { } else {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");