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

qemu: eliminate hardcoded indent from migration cookie xml

Browse Source 
This is also never seen by a human.
This commit is contained in:
Laine Stump 2014-03-12 18:00:10 -06:00
parent 64bb902451
commit acca913493
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_migration.c
View File

@ -542,7 +542,9 @@ static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf,
virBufferAsprintf(buf, " tlsPort='%d'", grap->tlsPort); virBufferAsprintf(buf, " tlsPort='%d'", grap->tlsPort);
if (grap->tlsSubject) { if (grap->tlsSubject) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<cert info='subject' value='%s'/>\n", grap->tlsSubject); virBufferEscapeString(buf, "<cert info='subject' value='%s'/>\n", grap->tlsSubject);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</graphics>\n"); virBufferAddLit(buf, "</graphics>\n");
} else { } else {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
@ -562,23 +564,28 @@ qemuMigrationCookieNetworkXMLFormat(virBufferPtr buf,
if (optr->net[i].vporttype != VIR_NETDEV_VPORT_PROFILE_NONE) { if (optr->net[i].vporttype != VIR_NETDEV_VPORT_PROFILE_NONE) {
if (empty) { if (empty) {
virBufferAddLit(buf, "<network>\n"); virBufferAddLit(buf, "<network>\n");
virBufferAdjustIndent(buf, 2);
empty = false; empty = false;
} }
virBufferAsprintf(buf, "<interface index='%zu' vporttype='%s'", virBufferAsprintf(buf, "<interface index='%zu' vporttype='%s'",
i, virNetDevVPortTypeToString(optr->net[i].vporttype)); i, virNetDevVPortTypeToString(optr->net[i].vporttype));
if (optr->net[i].portdata) { if (optr->net[i].portdata) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<portdata>%s</portdata>\n", virBufferEscapeString(buf, "<portdata>%s</portdata>\n",
optr->net[i].portdata); optr->net[i].portdata);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</interface>\n"); virBufferAddLit(buf, "</interface>\n");
} else { } else {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
} }
} }
if (!empty) if (!empty) {
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</network>\n"); virBufferAddLit(buf, "</network>\n");
} }
}
static int static int
@ -594,6 +601,7 @@ qemuMigrationCookieXMLFormat(virQEMUDriverPtr driver,
virUUIDFormat(mig->localHostuuid, hostuuidstr); virUUIDFormat(mig->localHostuuid, hostuuidstr);
virBufferAddLit(buf, "<qemu-migration>\n"); virBufferAddLit(buf, "<qemu-migration>\n");
virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<name>%s</name>\n", mig->name); virBufferEscapeString(buf, "<name>%s</name>\n", mig->name);
virBufferAsprintf(buf, "<uuid>%s</uuid>\n", uuidstr); virBufferAsprintf(buf, "<uuid>%s</uuid>\n", uuidstr);
virBufferEscapeString(buf, "<hostname>%s</hostname>\n", mig->localHostname); virBufferEscapeString(buf, "<hostname>%s</hostname>\n", mig->localHostname);
@ -613,14 +621,15 @@ qemuMigrationCookieXMLFormat(virQEMUDriverPtr driver,
mig->lockState) { mig->lockState) {
virBufferAsprintf(buf, "<lockstate driver='%s'>\n", virBufferAsprintf(buf, "<lockstate driver='%s'>\n",
mig->lockDriver); mig->lockDriver);
virBufferAdjustIndent(buf, 2);
virBufferAsprintf(buf, "<leases>%s</leases>\n", virBufferAsprintf(buf, "<leases>%s</leases>\n",
mig->lockState); mig->lockState);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</lockstate>\n"); virBufferAddLit(buf, "</lockstate>\n");
} }
if ((mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) && if ((mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) &&
mig->persistent) { mig->persistent) {
virBufferAdjustIndent(buf, 2);
if (qemuDomainDefFormatBuf(driver, if (qemuDomainDefFormatBuf(driver,
mig->persistent, mig->persistent,
VIR_DOMAIN_XML_INACTIVE | VIR_DOMAIN_XML_INACTIVE |
@ -628,7 +637,6 @@ qemuMigrationCookieXMLFormat(virQEMUDriverPtr driver,
VIR_DOMAIN_XML_MIGRATABLE, VIR_DOMAIN_XML_MIGRATABLE,
buf) < 0) buf) < 0)
return -1; return -1;
virBufferAdjustIndent(buf, -2);
} }
if ((mig->flags & QEMU_MIGRATION_COOKIE_NETWORK) && mig->network) if ((mig->flags & QEMU_MIGRATION_COOKIE_NETWORK) && mig->network)
@ -641,6 +649,7 @@ qemuMigrationCookieXMLFormat(virQEMUDriverPtr driver,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</qemu-migration>\n"); virBufferAddLit(buf, "</qemu-migration>\n");
return 0; return 0;
} }