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

snapshot: Tweaks to bulk dumpxml/import internals

Browse Source 
Change the return value of virDomainSnapshotObjListParse() to return
the number of snapshots imported, and allow a return of 0 (the
original proposal of adding a flag to virDomainSnapshotCreateXML
required returning an arbitrary non-NULL snapshot, but that idea was
abandoned; and by returning a count, we are no longer constrained to a
non-empty list).

Document which flags are supported (namely, just SECURE) in
virDomainSnapshotObjListFormat().

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Eric Blake 2019-03-11 06:50:23 -05:00
parent 063042c7d0
commit 967eef2b95
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/conf/virdomainsnapshotobjlist.c
View File

@ -43,8 +43,10 @@ struct _virDomainSnapshotObjList {
}; };
/* Parse a <snapshots> XML entry into snapshots, which must start empty. /* Parse a <snapshots> XML entry into snapshots, which must start
* Any <domain> sub-elements of a <domainsnapshot> must match domain_uuid. * empty. Any <domain> sub-elements of a <domainsnapshot> must match
* domain_uuid. @flags is virDomainSnapshotParseFlags. Return the
* number of snapshots parsed, or -1 on error.
*/ */
int int
virDomainSnapshotObjListParse(const char *xmlStr, virDomainSnapshotObjListParse(const char *xmlStr,
@ -98,11 +100,6 @@ virDomainSnapshotObjListParse(const char *xmlStr,
if ((n = virXPathNodeSet("./domainsnapshot", ctxt, &nodes)) < 0) if ((n = virXPathNodeSet("./domainsnapshot", ctxt, &nodes)) < 0)
goto cleanup; goto cleanup;
if (!n) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("expected at least one <domainsnapshot> child"));
goto cleanup;
}
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
virDomainSnapshotDefPtr def; virDomainSnapshotDefPtr def;
@ -137,7 +134,7 @@ virDomainSnapshotObjListParse(const char *xmlStr,
(*current_snap)->def->current = true; (*current_snap)->def->current = true;
} }
ret = 0; ret = n;
cleanup: cleanup:
if (ret < 0) { if (ret < 0) {
/* There were no snapshots before this call; so on error, just /* There were no snapshots before this call; so on error, just
@ -177,8 +174,9 @@ virDomainSnapshotFormatOne(void *payload,
} }
/* Format the XML for all snapshots in the list into buf. On error, /* Format the XML for all snapshots in the list into buf. @flags is
* clear the buffer and return -1. */ * virDomainSnapshotFormatFlags. On error, clear the buffer and return
* -1. */
int int
virDomainSnapshotObjListFormat(virBufferPtr buf, virDomainSnapshotObjListFormat(virBufferPtr buf,
const char *uuidstr, const char *uuidstr,
@ -196,6 +194,7 @@ virDomainSnapshotObjListFormat(virBufferPtr buf,
.flags = flags, .flags = flags,
}; };
virCheckFlags(VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE, -1);
virBufferAddLit(buf, "<snapshots"); virBufferAddLit(buf, "<snapshots");
if (current_snapshot) if (current_snapshot)
virBufferEscapeString(buf, " current='%s'", virBufferEscapeString(buf, " current='%s'",