9:53 a.m.
While looking at my work on incremental backups, Nir raised a good
point: if we want to recreate a set of known checkpoints on one
machine that will be taking over a domain from another machine,
my initial proposal required making multiple API calls to list the
XML for each checkpoint on the source, and then more API calls to
redefine each checkpoint on the destination; it also had the drawback
that the list has to be presented in topological order (the API won't
let you define a child checkpoint if the parent is not defined first).
He asked if I could instead add bulk APIs, for getting the XML for
all checkpoints at once, and then for redefining all checkpoints at
once.
Since my checkpoint code borrows heavily from concepts in the snapshot
code, I chose to tackle the problem by starting with this series, which
does the same thing for snapshots as what I plan to do for checkpoints.
That is, since this patch series adds virDomainGetXMLDesc(,
VIR_DOMAIN_XML_SNAPSHOTS) and virDomainSnapshotCreateXML(,
VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST), the checkpoint series
will add virDOmainGetXMLDesc(, VIR_DOMAIN_XML_CHECKPOINTS) and
virDomainCheckpointCreateXML(, VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_LIST)
with very similar code.
Note that I'm posting the series now to start review; the bulk
query is fully implemented (patch 6), while the bulk redefine still
needs more work (patch 7 defines the API, but the actual implementation
is trickier, so I'll be posting additional patches later once I get
them working). Patch 1 is a revision of work posted previously in a
different series where all other patches of that series are now on
mainline. Also available at:
https://repo.or.cz/libvirt/ericb.git/shortlog/refs/tags/snapshot-bulk-v1
Eric Blake (7):
domain: Document VIR_DOMAIN_XML_MIGRATABLE
snapshot: Give virDomainSnapshotDefFormat its own flags
snapshot: Refactor virDomainSnapshotDefFormat
snapshot: Add virDomainSnapshotObjListFormat
domain: Expand virDomainDefFormatInternal with snapshots
domain: Add VIR_DOMAIN_XML_SNAPSHOTS flag
snapshot: Add VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST flag
include/libvirt/libvirt-domain-snapshot.h | 3 +
include/libvirt/libvirt-domain.h | 1 +
src/conf/domain_conf.h | 8 ++
src/conf/snapshot_conf.h | 18 ++-
src/conf/domain_conf.c | 71 ++++++++--
src/conf/snapshot_conf.c | 162 ++++++++++++++++------
src/esx/esx_driver.c | 1 -
src/libvirt-domain-snapshot.c | 21 ++-
src/libvirt-domain.c | 14 ++
src/libvirt_private.syms | 2 +
src/network/bridge_driver.c | 3 +-
src/qemu/qemu_domain.c | 24 +++-
src/qemu/qemu_driver.c | 7 +-
src/test/test_driver.c | 10 +-
src/vbox/vbox_common.c | 5 +-
src/vz/vz_driver.c | 3 +-
tests/domainsnapshotxml2xmltest.c | 16 ++-
tools/virsh-domain.c | 7 +
tools/virsh-snapshot.c | 13 ++
19 files changed, 293 insertions(+), 96 deletions(-)
--
2.20.1
9:53 a.m.
New subject: [libvirt] [PATCH 1/7] domain: Document VIR_DOMAIN_XML_MIGRATABLE
Commit 28f8dfdc (1.0.0) added a flag to virDomainGetXMLDesc, but
failed to document its effects. And considering that the
MIGRATABLE flag has been the source of past bugs (CVE-2014-7823,
fixed in commit b1674ad5 (1.2.11), or even cf2d4c60 (1.2.13) where
flag mismatch broke virsh edit), make the wording wishy-washy
enough to discourage using the flag casually, by mentioning that
the resulting XML is more for internal use than for validation
against the schema.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/libvirt-domain.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index e2ed8b2772..072b92b717 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -2561,6 +2561,15 @@ virDomainGetControlInfo(virDomainPtr domain,
* describing CPU capabilities is modified to match actual
* capabilities of the host.
*
+ * If @flags contains VIR_DOMAIN_XML_MIGRATABLE, the XML is altered to
+ * assist in migrations, since the source and destination may be
+ * running different libvirt versions. This may include trimming
+ * redundant or default information that might confuse an older
+ * recipient, or exposing internal details that aid a newer recipient;
+ * this flag is rejected on read-only connections, and the resulting
+ * XML might not validate against the schema, so it is mainly for
+ * internal use.
+ *
* Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error.
* the caller must free() the returned value.
*/
--
2.20.1
9:53 a.m.
New subject: [libvirt] [PATCH 2/7] snapshot: Give virDomainSnapshotDefFormat its own flags
virDomainSnapshotDefFormat currently takes two sets of knobs:
an 'unsigned int flags' argument that can currently just be
VIR_DOMAIN_DEF_FORMAT_SECURE, and an 'int internal' argument used as
a bool to determine whether to output an additional element. It
then reuses the 'flags' knob to call into virDomainDefFormatInternal(),
which takes a different set of flags. In fact, prior to commit 0ecd6851
(1.2.12), the 'flags' argument actually took the public
VIR_DOMAIN_XML_SECURE, which was even more confusing. Let's borrow
from the style of that earlier commit, by introducing a function
for translating from the public flags (VIR_DOMAIN_SNAPSHOT_XML_SECURE
was just recently introduced) into a new enum specific to snapshot
formatting, and adjust all callers to use snapshot-specific enum
values when formatting, and where the formatter now uses a new
variable 'domainflags' to make it obvious when we are translating
from snapshot flags back to domain flags. We don't even have to
use the conversion function for drivers that don't accept the
public VIR_DOMAIN_SNAPSHOT_XML_SECURE flag.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/conf/snapshot_conf.h | 10 ++++++++--
src/conf/snapshot_conf.c | 28 ++++++++++++++++++++++------
src/esx/esx_driver.c | 1 -
src/libvirt_private.syms | 1 +
src/qemu/qemu_domain.c | 3 +--
src/qemu/qemu_driver.c | 3 +--
src/test/test_driver.c | 3 +--
src/vbox/vbox_common.c | 5 ++---
src/vz/vz_driver.c | 3 +--
tests/domainsnapshotxml2xmltest.c | 16 +++++++++-------
10 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index cc25164261..f990ec8f90 100644
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -101,6 +101,13 @@ typedef enum {
VIR_DOMAIN_SNAPSHOT_PARSE_OFFLINE = 1 << 3,
} virDomainSnapshotParseFlags;
+typedef enum {
+ VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE = 1 << 0,
+ VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL = 1 << 1,
+} virDomainSnapshotFormatFlags;
+
+unsigned int virDomainSnapshotFormatConvertXMLFlags(unsigned int flags);
+
virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
@@ -115,8 +122,7 @@ char *virDomainSnapshotDefFormat(const char *domain_uuid,
virDomainSnapshotDefPtr def,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
- unsigned int flags,
- int internal);
+ unsigned int flags);
int virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapshot,
int default_snapshot,
bool require_match);
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 1afc7de30c..b8012cb111 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -652,6 +652,19 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def,
return ret;
}
+/* Converts public VIR_DOMAIN_SNAPSHOT_XML_* into
+ * VIR_DOMAIN_SNAPSHOT_FORMAT_* flags, and silently ignores any other
+ * flags. */
+unsigned int virDomainSnapshotFormatConvertXMLFlags(unsigned int flags)
+{
+ unsigned int formatFlags = 0;
+
+ if (flags & VIR_DOMAIN_SNAPSHOT_XML_SECURE)
+ formatFlags |= VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE;
+
+ return formatFlags;
+}
+
static int
virDomainSnapshotDiskDefFormat(virBufferPtr buf,
virDomainSnapshotDiskDefPtr disk,
@@ -692,15 +705,17 @@ virDomainSnapshotDefFormat(const char *domain_uuid,
virDomainSnapshotDefPtr def,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
- unsigned int flags,
- int internal)
+ unsigned int flags)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
size_t i;
+ int domainflags = VIR_DOMAIN_DEF_FORMAT_INACTIVE;
- virCheckFlags(VIR_DOMAIN_DEF_FORMAT_SECURE, NULL);
+ virCheckFlags(VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE |
+ VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL, NULL);
- flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE;
+ if (flags & VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE)
+ domainflags |= VIR_DOMAIN_DEF_FORMAT_SECURE;
virBufferAddLit(&buf, "<domainsnapshot>\n");
virBufferAdjustIndent(&buf, 2);
@@ -742,7 +757,8 @@ virDomainSnapshotDefFormat(const char *domain_uuid,
}
if (def->dom) {
- if (virDomainDefFormatInternal(def->dom, caps, flags, &buf, xmlopt) <
0)
+ if (virDomainDefFormatInternal(def->dom, caps, domainflags, &buf,
+ xmlopt) < 0)
goto error;
} else if (domain_uuid) {
virBufferAddLit(&buf, "<domain>\n");
@@ -756,7 +772,7 @@ virDomainSnapshotDefFormat(const char *domain_uuid,
virDomainXMLOptionGetSaveCookie(xmlopt)) < 0)
goto error;
- if (internal)
+ if (flags & VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL)
virBufferAsprintf(&buf, "<active>%d</active>\n",
def->current);
virBufferAdjustIndent(&buf, -2);
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 379c2bae73..8ddfa93847 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -4204,7 +4204,6 @@ esxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
virUUIDFormat(snapshot->domain->uuid, uuid_string);
xml = virDomainSnapshotDefFormat(uuid_string, &def, priv->caps,
priv->xmlopt,
- virDomainDefFormatConvertXMLFlags(flags),
0);
cleanup:
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b720acdc93..6f72d45870 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -887,6 +887,7 @@ virDomainSnapshotFindByName;
virDomainSnapshotForEach;
virDomainSnapshotForEachChild;
virDomainSnapshotForEachDescendant;
+virDomainSnapshotFormatConvertXMLFlags;
virDomainSnapshotIsExternal;
virDomainSnapshotLocationTypeFromString;
virDomainSnapshotLocationTypeToString;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index bbd4a5efe8..4a324b042a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8408,8 +8408,7 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm,
virUUIDFormat(vm->def->uuid, uuidstr);
newxml = virDomainSnapshotDefFormat(
uuidstr, snapshot->def, caps, xmlopt,
- virDomainDefFormatConvertXMLFlags(QEMU_DOMAIN_FORMAT_LIVE_FLAGS),
- 1);
+ VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE | VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL);
if (newxml == NULL)
return -1;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index fe1b7801e9..7cfeed4479 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16262,8 +16262,7 @@ qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
xml = virDomainSnapshotDefFormat(uuidstr, snap->def,
driver->caps, driver->xmlopt,
- virDomainDefFormatConvertXMLFlags(flags),
- 0);
+ virDomainSnapshotFormatConvertXMLFlags(flags));
cleanup:
virDomainObjEndAPI(&vm);
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index ce0df1f8e3..a6a67d42e2 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -6209,8 +6209,7 @@ testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
xml = virDomainSnapshotDefFormat(uuidstr, snap->def, privconn->caps,
privconn->xmlopt,
- virDomainDefFormatConvertXMLFlags(flags),
- 0);
+ virDomainSnapshotFormatConvertXMLFlags(flags));
cleanup:
virDomainObjEndAPI(&vm);
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index d95fe7c7ae..1efd357b49 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -5373,7 +5373,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
VIR_FREE(currentSnapshotXmlFilePath);
if (virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml",
machineLocationPath, snapshotMachineDesc->currentSnapshot) < 0)
goto cleanup;
- char *snapshotContent = virDomainSnapshotDefFormat(NULL, def, data->caps,
data->xmlopt, VIR_DOMAIN_DEF_FORMAT_SECURE, 0);
+ char *snapshotContent = virDomainSnapshotDefFormat(NULL, def, data->caps,
data->xmlopt, VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE);
if (snapshotContent == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to get snapshot content"));
@@ -6321,8 +6321,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr
snapshot,
virUUIDFormat(dom->uuid, uuidstr);
memcpy(def->dom->uuid, dom->uuid, VIR_UUID_BUFLEN);
ret = virDomainSnapshotDefFormat(uuidstr, def, data->caps, data->xmlopt,
- virDomainDefFormatConvertXMLFlags(flags),
- 0);
+ 0);
cleanup:
virDomainSnapshotDefFree(def);
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 2d2eaf88a6..066d617524 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -2291,8 +2291,7 @@ vzDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, unsigned
int flags)
xml = virDomainSnapshotDefFormat(uuidstr, snap->def,
privconn->driver->caps,
privconn->driver->xmlopt,
- virDomainDefFormatConvertXMLFlags(flags),
- 0);
+ virDomainSnapshotFormatConvertXMLFlags(flags));
cleanup:
virDomainSnapshotObjListFree(snapshots);
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 2a07fe0789..9eb71780fc 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -78,13 +78,16 @@ testCompareXMLToXMLFiles(const char *inxml,
char *actual = NULL;
int ret = -1;
virDomainSnapshotDefPtr def = NULL;
- unsigned int flags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS;
+ unsigned int parseflags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS;
+ unsigned int formatflags = VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE;
- if (internal)
- flags |= VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL;
+ if (internal) {
+ parseflags |= VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL;
+ formatflags |= VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL;
+ }
if (redefine)
- flags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE;
+ parseflags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE;
if (virTestLoadFile(inxml, &inXmlData) < 0)
goto cleanup;
@@ -94,13 +97,12 @@ testCompareXMLToXMLFiles(const char *inxml,
if (!(def = virDomainSnapshotDefParseString(inXmlData, driver.caps,
driver.xmlopt,
- flags)))
+ parseflags)))
goto cleanup;
if (!(actual = virDomainSnapshotDefFormat(uuid, def, driver.caps,
driver.xmlopt,
- VIR_DOMAIN_DEF_FORMAT_SECURE,
- internal)))
+ formatflags)))
goto cleanup;
if (!redefine) {
--
2.20.1
9:53 a.m.
New subject: [libvirt] [PATCH 3/7] snapshot: Refactor virDomainSnapshotDefFormat
Split out an internal helper that produces format into a
virBuffer, similar to what domain_conf.c does, and making
the next patch easier to write.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/conf/snapshot_conf.c | 103 ++++++++++++++++++++++-----------------
1 file changed, 59 insertions(+), 44 deletions(-)
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index b8012cb111..b7b5873cbe 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -700,92 +700,107 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf,
}
-char *
-virDomainSnapshotDefFormat(const char *domain_uuid,
- virDomainSnapshotDefPtr def,
- virCapsPtr caps,
- virDomainXMLOptionPtr xmlopt,
- unsigned int flags)
+static int
+virDomainSnapshotDefFormatInternal(virBufferPtr buf,
+ const char *domain_uuid,
+ virDomainSnapshotDefPtr def,
+ virCapsPtr caps,
+ virDomainXMLOptionPtr xmlopt,
+ unsigned int flags)
{
- virBuffer buf = VIR_BUFFER_INITIALIZER;
size_t i;
int domainflags = VIR_DOMAIN_DEF_FORMAT_INACTIVE;
- virCheckFlags(VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE |
- VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL, NULL);
-
if (flags & VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE)
domainflags |= VIR_DOMAIN_DEF_FORMAT_SECURE;
- virBufferAddLit(&buf, "<domainsnapshot>\n");
- virBufferAdjustIndent(&buf, 2);
+ virBufferAddLit(buf, "<domainsnapshot>\n");
+ virBufferAdjustIndent(buf, 2);
- virBufferEscapeString(&buf, "<name>%s</name>\n",
def->name);
+ virBufferEscapeString(buf, "<name>%s</name>\n", def->name);
if (def->description)
- virBufferEscapeString(&buf,
"<description>%s</description>\n",
+ virBufferEscapeString(buf,
"<description>%s</description>\n",
def->description);
- virBufferAsprintf(&buf, "<state>%s</state>\n",
+ virBufferAsprintf(buf, "<state>%s</state>\n",
virDomainSnapshotStateTypeToString(def->state));
if (def->parent) {
- virBufferAddLit(&buf, "<parent>\n");
- virBufferAdjustIndent(&buf, 2);
- virBufferEscapeString(&buf, "<name>%s</name>\n",
def->parent);
- virBufferAdjustIndent(&buf, -2);
- virBufferAddLit(&buf, "</parent>\n");
+ virBufferAddLit(buf, "<parent>\n");
+ virBufferAdjustIndent(buf, 2);
+ virBufferEscapeString(buf, "<name>%s</name>\n",
def->parent);
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</parent>\n");
}
- virBufferAsprintf(&buf,
"<creationTime>%lld</creationTime>\n",
+ virBufferAsprintf(buf, "<creationTime>%lld</creationTime>\n",
def->creationTime);
if (def->memory) {
- virBufferAsprintf(&buf, "<memory snapshot='%s'",
+ virBufferAsprintf(buf, "<memory snapshot='%s'",
virDomainSnapshotLocationTypeToString(def->memory));
- virBufferEscapeString(&buf, " file='%s'", def->file);
- virBufferAddLit(&buf, "/>\n");
+ virBufferEscapeString(buf, " file='%s'", def->file);
+ virBufferAddLit(buf, "/>\n");
}
if (def->ndisks) {
- virBufferAddLit(&buf, "<disks>\n");
- virBufferAdjustIndent(&buf, 2);
+ virBufferAddLit(buf, "<disks>\n");
+ virBufferAdjustIndent(buf, 2);
for (i = 0; i < def->ndisks; i++) {
- if (virDomainSnapshotDiskDefFormat(&buf, &def->disks[i], xmlopt)
< 0)
+ if (virDomainSnapshotDiskDefFormat(buf, &def->disks[i], xmlopt) <
0)
goto error;
}
- virBufferAdjustIndent(&buf, -2);
- virBufferAddLit(&buf, "</disks>\n");
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</disks>\n");
}
if (def->dom) {
- if (virDomainDefFormatInternal(def->dom, caps, domainflags, &buf,
+ if (virDomainDefFormatInternal(def->dom, caps, domainflags, buf,
xmlopt) < 0)
goto error;
} else if (domain_uuid) {
- virBufferAddLit(&buf, "<domain>\n");
- virBufferAdjustIndent(&buf, 2);
- virBufferAsprintf(&buf, "<uuid>%s</uuid>\n",
domain_uuid);
- virBufferAdjustIndent(&buf, -2);
- virBufferAddLit(&buf, "</domain>\n");
+ virBufferAddLit(buf, "<domain>\n");
+ virBufferAdjustIndent(buf, 2);
+ virBufferAsprintf(buf, "<uuid>%s</uuid>\n", domain_uuid);
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</domain>\n");
}
- if (virSaveCookieFormatBuf(&buf, def->cookie,
+ if (virSaveCookieFormatBuf(buf, def->cookie,
virDomainXMLOptionGetSaveCookie(xmlopt)) < 0)
goto error;
if (flags & VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL)
- virBufferAsprintf(&buf, "<active>%d</active>\n",
def->current);
+ virBufferAsprintf(buf, "<active>%d</active>\n",
def->current);
- virBufferAdjustIndent(&buf, -2);
- virBufferAddLit(&buf, "</domainsnapshot>\n");
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</domainsnapshot>\n");
- if (virBufferCheckError(&buf) < 0)
- return NULL;
+ if (virBufferCheckError(buf) < 0)
+ goto error;
- return virBufferContentAndReset(&buf);
+ return 0;
error:
- virBufferFreeAndReset(&buf);
- return NULL;
+ virBufferFreeAndReset(buf);
+ return -1;
+}
+
+char *
+virDomainSnapshotDefFormat(const char *domain_uuid,
+ virDomainSnapshotDefPtr def,
+ virCapsPtr caps,
+ virDomainXMLOptionPtr xmlopt,
+ unsigned int flags)
+{
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
+
+ virCheckFlags(VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE |
+ VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL, NULL);
+ if (virDomainSnapshotDefFormatInternal(&buf, domain_uuid, def, caps,
+ xmlopt, flags) < 0)
+ return NULL;
+
+ return virBufferContentAndReset(&buf);
}
/* Snapshot Obj functions */
--
2.20.1
9:53 a.m.
New subject: [libvirt] [PATCH 3/7] snapshot: Refactor virDomainSnapshotDefFormat
On 2/20/19 9:53 AM, Eric Blake wrote:
Split out an internal helper that produces format into a
virBuffer, similar to what domain_conf.c does, and making
the next patch easier to write.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/conf/snapshot_conf.c | 103 ++++++++++++++++++++++-----------------
1 file changed, 59 insertions(+), 44 deletions(-)
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index b8012cb111..b7b5873cbe 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -700,92 +700,107 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf,
}
-char *
-virDomainSnapshotDefFormat(const char *domain_uuid,
- virDomainSnapshotDefPtr def,
- virCapsPtr caps,
- virDomainXMLOptionPtr xmlopt,
- unsigned int flags)
+static int
+virDomainSnapshotDefFormatInternal(virBufferPtr buf,
+ const char *domain_uuid,
This should really be named uuidstr, especially once I push my trivial
patch that favors the correct naming.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
9:53 a.m.
New subject: [libvirt] [PATCH 4/7] snapshot: Add virDomainSnapshotObjListFormat
Add a new function to output all of the domain's snapshots in one
buffer.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/conf/snapshot_conf.h | 8 +++++++-
src/conf/snapshot_conf.c | 39 +++++++++++++++++++++++++++++++++++++++
src/libvirt_private.syms | 1 +
3 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index f990ec8f90..458c6c7b5c 100644
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -1,7 +1,7 @@
/*
* snapshot_conf.h: domain snapshot XML processing
*
- * Copyright (C) 2006-2014 Red Hat, Inc.
+ * Copyright (C) 2006-2019 Red Hat, Inc.
* Copyright (C) 2006-2008 Daniel P. Berrange
*
* This library is free software; you can redistribute it and/or
@@ -123,6 +123,12 @@ char *virDomainSnapshotDefFormat(const char *domain_uuid,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
unsigned int flags);
+int virDomainSnapshotObjListFormat(virBufferPtr buf,
+ const char *uuidstr,
+ virDomainSnapshotObjListPtr snapshots,
+ virCapsPtr caps,
+ virDomainXMLOptionPtr xmlopt,
+ unsigned int flags);
int virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapshot,
int default_snapshot,
bool require_match);
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index b7b5873cbe..2797345542 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -803,6 +803,45 @@ virDomainSnapshotDefFormat(const char *domain_uuid,
return virBufferContentAndReset(&buf);
}
+struct virDomainSnapshotFormatData {
+ virBufferPtr buf;
+ const char *uuidstr;
+ virCapsPtr caps;
+ virDomainXMLOptionPtr xmlopt;
+ unsigned int flags;
+};
+
+static int
+virDomainSnapshotFormatOne(void *payload, const void *name ATTRIBUTE_UNUSED,
+ void *opaque)
+{
+ virDomainSnapshotObjPtr snap = payload;
+ struct virDomainSnapshotFormatData *data = opaque;
+ return virDomainSnapshotDefFormatInternal(data->buf, data->uuidstr,
+ snap->def, data->caps,
+ data->xmlopt, data->flags);
+}
+
+
+int
+virDomainSnapshotObjListFormat(virBufferPtr buf,
+ const char *uuidstr,
+ virDomainSnapshotObjListPtr snapshots,
+ virCapsPtr caps,
+ virDomainXMLOptionPtr xmlopt,
+ unsigned int flags)
+{
+ struct virDomainSnapshotFormatData data = {
+ .buf = buf,
+ .uuidstr = uuidstr,
+ .caps = caps,
+ .xmlopt = xmlopt,
+ .flags = flags,
+ };
+ return virDomainSnapshotForEach(snapshots, virDomainSnapshotFormatOne,
+ &data);
+}
+
/* Snapshot Obj functions */
static virDomainSnapshotObjPtr virDomainSnapshotObjNew(void)
{
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6f72d45870..330ec16032 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -891,6 +891,7 @@ virDomainSnapshotFormatConvertXMLFlags;
virDomainSnapshotIsExternal;
virDomainSnapshotLocationTypeFromString;
virDomainSnapshotLocationTypeToString;
+virDomainSnapshotObjListFormat;
virDomainSnapshotObjListFree;
virDomainSnapshotObjListGetNames;
virDomainSnapshotObjListNew;
--
2.20.1
9:53 a.m.
New subject: [libvirt] [PATCH 5/7] domain: Expand virDomainDefFormatInternal with snapshots
Make it possible to grab all snapshot XMLs via a single API
call, by adding a new internal flag. All callers are adjusted,
for now passing NULL and not using the new flag. A new wrapper
virDomainDefFormatFull() is added to make it easier for the
next patch to add a few callers without having to revisit all
existing clients of virDomainDefFormat().
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/conf/domain_conf.h | 8 +++++
src/conf/domain_conf.c | 58 +++++++++++++++++++++++++++++++------
src/conf/snapshot_conf.c | 4 +--
src/network/bridge_driver.c | 3 +-
src/qemu/qemu_domain.c | 2 +-
5 files changed, 62 insertions(+), 13 deletions(-)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9bccd8bcd1..9b13c147da 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3047,6 +3047,7 @@ typedef enum {
VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM = 1 << 6,
VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT = 1 << 7,
VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST = 1 << 8,
+ VIR_DOMAIN_DEF_FORMAT_SNAPSHOTS = 1 << 9,
} virDomainDefFormatFlags;
/* Use these flags to skip specific domain ABI consistency checks done
@@ -3124,12 +3125,19 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int
flags);
char *virDomainDefFormat(virDomainDefPtr def,
virCapsPtr caps,
unsigned int flags);
+char *virDomainDefFormatFull(virDomainDefPtr def,
+ virCapsPtr caps,
+ virDomainSnapshotObjListPtr snapshots,
+ virDomainSnapshotObjPtr current_snapshot,
+ unsigned int flags);
char *virDomainObjFormat(virDomainXMLOptionPtr xmlopt,
virDomainObjPtr obj,
virCapsPtr caps,
unsigned int flags);
int virDomainDefFormatInternal(virDomainDefPtr def,
virCapsPtr caps,
+ virDomainSnapshotObjListPtr snapshots,
+ virDomainSnapshotObjPtr current_snapshot,
unsigned int flags,
virBufferPtr buf,
virDomainXMLOptionPtr xmlopt);
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 56c437ca0a..ae496834ee 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1,7 +1,7 @@
/*
* domain_conf.c: domain XML processing
*
- * Copyright (C) 2006-2016 Red Hat, Inc.
+ * Copyright (C) 2006-2019 Red Hat, Inc.
* Copyright (C) 2006-2008 Daniel P. Berrange
* Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
*
@@ -28264,6 +28264,8 @@ virDomainVsockDefFormat(virBufferPtr buf,
int
virDomainDefFormatInternal(virDomainDefPtr def,
virCapsPtr caps,
+ virDomainSnapshotObjListPtr snapshots,
+ virDomainSnapshotObjPtr current_snapshot,
unsigned int flags,
virBufferPtr buf,
virDomainXMLOptionPtr xmlopt)
@@ -28281,9 +28283,16 @@ virDomainDefFormatInternal(virDomainDefPtr def,
VIR_DOMAIN_DEF_FORMAT_STATUS |
VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET |
VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES |
- VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST,
+ VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST |
+ VIR_DOMAIN_DEF_FORMAT_SNAPSHOTS,
-1);
+ if ((flags & VIR_DOMAIN_DEF_FORMAT_SNAPSHOTS) && !snapshots) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("snapshots requested but not provided"));
+ goto error;
+ }
+
if (!(type = virDomainVirtTypeToString(def->virtType))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected domain type %d"), def->virtType);
@@ -29068,6 +29077,23 @@ virDomainDefFormatInternal(virDomainDefPtr def,
virDomainSEVDefFormat(buf, def->sev);
+ if (flags & VIR_DOMAIN_DEF_FORMAT_SNAPSHOTS) {
+ unsigned int snapflags = flags & VIR_DOMAIN_DEF_FORMAT_SECURE ?
+ VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE : 0;
+
+ virBufferAddLit(buf, "<snapshots");
+ if (current_snapshot)
+ virBufferEscapeString(buf, " current='%s'",
+ current_snapshot->def->name);
+ virBufferAddLit(buf, ">\n");
+ virBufferAdjustIndent(buf, 2);
+ if (virDomainSnapshotObjListFormat(buf, uuidstr, snapshots, caps,
+ xmlopt, snapflags))
+ goto error;
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</snapshots>\n");
+ }
+
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</domain>\n");
@@ -29103,16 +29129,29 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int
flags)
}
+char *
+virDomainDefFormatFull(virDomainDefPtr def, virCapsPtr caps,
+ virDomainSnapshotObjListPtr snapshots,
+ virDomainSnapshotObjPtr current_snapshot,
+ unsigned int flags)
+{
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
+
+ virCheckFlags(VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS |
+ VIR_DOMAIN_DEF_FORMAT_SNAPSHOTS, NULL);
+ if (virDomainDefFormatInternal(def, caps, snapshots, current_snapshot,
+ flags, &buf, NULL) < 0)
+ return NULL;
+
+ return virBufferContentAndReset(&buf);
+}
+
+
char *
virDomainDefFormat(virDomainDefPtr def, virCapsPtr caps, unsigned int flags)
{
- virBuffer buf = VIR_BUFFER_INITIALIZER;
-
virCheckFlags(VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS, NULL);
- if (virDomainDefFormatInternal(def, caps, flags, &buf, NULL) < 0)
- return NULL;
-
- return virBufferContentAndReset(&buf);
+ return virDomainDefFormatFull(def, caps, NULL, NULL, flags);
}
@@ -29144,7 +29183,8 @@ virDomainObjFormat(virDomainXMLOptionPtr xmlopt,
xmlopt->privateData.format(&buf, obj) < 0)
goto error;
- if (virDomainDefFormatInternal(obj->def, caps, flags, &buf, xmlopt) < 0)
+ if (virDomainDefFormatInternal(obj->def, caps, NULL, NULL, flags, &buf,
+ xmlopt) < 0)
goto error;
virBufferAdjustIndent(&buf, -2);
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 2797345542..731747b468 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -754,8 +754,8 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf,
}
if (def->dom) {
- if (virDomainDefFormatInternal(def->dom, caps, domainflags, buf,
- xmlopt) < 0)
+ if (virDomainDefFormatInternal(def->dom, caps, NULL, NULL, domainflags,
+ buf, xmlopt) < 0)
goto error;
} else if (domain_uuid) {
virBufferAddLit(buf, "<domain>\n");
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 6d80818e40..d1532fff0c 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -226,7 +226,8 @@ networkRunHook(virNetworkObjPtr obj,
goto cleanup;
if (virNetworkDefFormatBuf(&buf, def, 0) < 0)
goto cleanup;
- if (dom && virDomainDefFormatInternal(dom, NULL, 0, &buf, NULL) <
0)
+ if (dom && virDomainDefFormatInternal(dom, NULL, NULL, NULL, 0,
&buf,
+ NULL) < 0)
goto cleanup;
virBufferAdjustIndent(&buf, -2);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4a324b042a..51d1b19c00 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7892,7 +7892,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
}
format:
- ret = virDomainDefFormatInternal(def, caps,
+ ret = virDomainDefFormatInternal(def, caps, NULL, NULL,
virDomainDefFormatConvertXMLFlags(flags),
buf, driver->xmlopt);
--
2.20.1
9:53 a.m.
New subject: [libvirt] [PATCH 6/7] domain: Add VIR_DOMAIN_XML_SNAPSHOTS flag
Right now, copying the state of a transient domain with snapshots
from one host to another requires multiple API calls on both
machines - on the host: get the domain XML, get a list of the
snapshots, and then for each snapshot get the snapshot's XML;
then on the destination: create the domain, then multiple
domain snapshot create calls with the REDEFINE flag. This
patch aims to make the process use fewer APIs by making it
possible to grab the XML for all snapshots at the same time as
grabbing the domain XML. Note that we had to do the modification
to virDomainGetXMLDesc(), rather than virDomainSnapshotGetXMLDesc(),
since the latter requires a single non-NULL snapshot object,
whereas we want the list of all snapshots for the domain (even
if the list has 0 elements).
The new information is provided as:
<domain ...>
...
</devices>
<snapshots current='name'>
<domainsnapshot>
...
</domainsnapshot>
<domainsnapshot>
...
</domainsnapshot>
</snapshots>
</domain>
For now, I did not modify the schema to permit this information
during virDomainDefineXML; it is still necessary to use
virDomainSnapshotCreateXML with VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE
multiple times to recreate the added state output here.
Unfortunately, libvirt versions between 1.2.12 and 5.0.0 will
silently ignore the new flag, rather than diagnosing that they
don't support it; but at least silent lack of snapshots from
an older server is not a security hole.
Plumb the new flag into the test and qemu driver, and into virsh
dumpxml.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
include/libvirt/libvirt-domain.h | 1 +
src/conf/domain_conf.c | 13 ++++++++-----
src/libvirt-domain.c | 5 +++++
src/qemu/qemu_domain.c | 23 +++++++++++++++++------
src/qemu/qemu_driver.c | 4 ++--
src/test/test_driver.c | 7 ++++---
tools/virsh-domain.c | 7 +++++++
7 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index 1d5bdb545d..a8ebb68388 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -1570,6 +1570,7 @@ typedef enum {
VIR_DOMAIN_XML_INACTIVE = (1 << 1), /* dump inactive domain information */
VIR_DOMAIN_XML_UPDATE_CPU = (1 << 2), /* update guest CPU requirements
according to host CPU */
VIR_DOMAIN_XML_MIGRATABLE = (1 << 3), /* dump XML suitable for migration */
+ VIR_DOMAIN_XML_SNAPSHOTS = (1 << 4), /* include all snapshots in the dump
*/
} virDomainXMLFlags;
typedef enum {
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ae496834ee..88cb2d8ae5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -29109,11 +29109,12 @@ virDomainDefFormatInternal(virDomainDefPtr def,
return -1;
}
-/* Converts VIR_DOMAIN_XML_COMMON_FLAGS into VIR_DOMAIN_DEF_FORMAT_*
- * flags, and silently ignores any other flags. Note that the caller
- * should validate the set of flags it is willing to accept; see also
- * the comment on VIR_DOMAIN_XML_COMMON_FLAGS about security
- * considerations with adding new flags. */
+/* Converts VIR_DOMAIN_XML_COMMON_FLAGS and VIR_DOMAIN_XML_SNAPSHOTS
+ * into VIR_DOMAIN_DEF_FORMAT_* flags, and silently ignores any other
+ * flags. Note that the caller should validate the set of flags it is
+ * willing to accept; see also the comment on
+ * VIR_DOMAIN_XML_COMMON_FLAGS about security considerations with
+ * adding new flags. */
unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags)
{
unsigned int formatFlags = 0;
@@ -29124,6 +29125,8 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int
flags)
formatFlags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE;
if (flags & VIR_DOMAIN_XML_MIGRATABLE)
formatFlags |= VIR_DOMAIN_DEF_FORMAT_MIGRATABLE;
+ if (flags & VIR_DOMAIN_XML_SNAPSHOTS)
+ formatFlags |= VIR_DOMAIN_DEF_FORMAT_SNAPSHOTS;
return formatFlags;
}
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 072b92b717..2691698bd5 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -2570,6 +2570,11 @@ virDomainGetControlInfo(virDomainPtr domain,
* XML might not validate against the schema, so it is mainly for
* internal use.
*
+ * If @flags contains VIR_DOMAIN_XML_SNAPSHOTS, the XML will include
+ * an additional <snapshots> child element describing all snapshots
+ * belonging to the domain, including an attribute current='name' if
+ * one of those snapshots is current.
+ *
* Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error.
* the caller must free() the returned value.
*/
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 51d1b19c00..da0fde78a6 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7715,6 +7715,7 @@ qemuDomainDefCopy(virQEMUDriverPtr driver,
static int
qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
+ virDomainObjPtr vm,
virDomainDefPtr def,
virCPUDefPtr origCPU,
unsigned int flags,
@@ -7724,6 +7725,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
virDomainDefPtr copy = NULL;
virCapsPtr caps = NULL;
virQEMUCapsPtr qemuCaps = NULL;
+ bool snapshots = flags & VIR_DOMAIN_XML_SNAPSHOTS;
virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU, -1);
@@ -7892,7 +7894,14 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
}
format:
- ret = virDomainDefFormatInternal(def, caps, NULL, NULL,
+ if (snapshots && !vm) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("snapshots XML requested but not provided"));
+ goto cleanup;
+ }
+ ret = virDomainDefFormatInternal(def, caps,
+ snapshots ? vm->snapshots : NULL,
+ snapshots ? vm->current_snapshot : NULL,
virDomainDefFormatConvertXMLFlags(flags),
buf, driver->xmlopt);
@@ -7910,19 +7919,21 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver,
unsigned int flags,
virBufferPtr buf)
{
- return qemuDomainDefFormatBufInternal(driver, def, NULL, flags, buf);
+ return qemuDomainDefFormatBufInternal(driver, NULL, def, NULL, flags, buf);
}
static char *
qemuDomainDefFormatXMLInternal(virQEMUDriverPtr driver,
+ virDomainObjPtr vm,
virDomainDefPtr def,
virCPUDefPtr origCPU,
unsigned int flags)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
- if (qemuDomainDefFormatBufInternal(driver, def, origCPU, flags, &buf) < 0)
+ if (qemuDomainDefFormatBufInternal(driver, vm, def, origCPU, flags,
+ &buf) < 0)
return NULL;
return virBufferContentAndReset(&buf);
@@ -7934,7 +7945,7 @@ qemuDomainDefFormatXML(virQEMUDriverPtr driver,
virDomainDefPtr def,
unsigned int flags)
{
- return qemuDomainDefFormatXMLInternal(driver, def, NULL, flags);
+ return qemuDomainDefFormatXMLInternal(driver, NULL, def, NULL, flags);
}
@@ -7953,7 +7964,7 @@ char *qemuDomainFormatXML(virQEMUDriverPtr driver,
origCPU = priv->origCPU;
}
- return qemuDomainDefFormatXMLInternal(driver, def, origCPU, flags);
+ return qemuDomainDefFormatXMLInternal(driver, vm, def, origCPU, flags);
}
char *
@@ -7970,7 +7981,7 @@ qemuDomainDefFormatLive(virQEMUDriverPtr driver,
if (compatible)
flags |= VIR_DOMAIN_XML_MIGRATABLE;
- return qemuDomainDefFormatXMLInternal(driver, def, origCPU, flags);
+ return qemuDomainDefFormatXMLInternal(driver, NULL, def, origCPU, flags);
}
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7cfeed4479..07323d2efc 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7337,8 +7337,8 @@ static char
virDomainObjPtr vm;
char *ret = NULL;
- virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU,
- NULL);
+ virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU |
+ VIR_DOMAIN_XML_SNAPSHOTS, NULL);
if (!(vm = qemuDomObjFromDomain(dom)))
goto cleanup;
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index a6a67d42e2..e810207af0 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2628,7 +2628,7 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int
flags)
virDomainObjPtr privdom;
char *ret = NULL;
- virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL);
+ virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_SNAPSHOTS, NULL);
if (!(privdom = testDomObjFromDomain(domain)))
return NULL;
@@ -2636,8 +2636,9 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int
flags)
def = (flags & VIR_DOMAIN_XML_INACTIVE) &&
privdom->newDef ? privdom->newDef : privdom->def;
- ret = virDomainDefFormat(def, privconn->caps,
- virDomainDefFormatConvertXMLFlags(flags));
+ ret = virDomainDefFormatFull(def, privconn->caps,
+ privdom->snapshots, privdom->current_snapshot,
+ virDomainDefFormatConvertXMLFlags(flags));
virDomainObjEndAPI(&privdom);
return ret;
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 5699018dcc..78854b1e0a 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -10055,6 +10055,10 @@ static const vshCmdOptDef opts_dumpxml[] = {
.type = VSH_OT_BOOL,
.help = N_("provide XML suitable for migrations")
},
+ {.name = "snapshots",
+ .type = VSH_OT_BOOL,
+ .help = N_("include all domain snapshots in XML dump"),
+ },
{.name = NULL}
};
@@ -10069,6 +10073,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd)
bool secure = vshCommandOptBool(cmd, "security-info");
bool update = vshCommandOptBool(cmd, "update-cpu");
bool migratable = vshCommandOptBool(cmd, "migratable");
+ bool snapshots = vshCommandOptBool(cmd, "snapshots");
if (inactive)
flags |= VIR_DOMAIN_XML_INACTIVE;
@@ -10078,6 +10083,8 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd)
flags |= VIR_DOMAIN_XML_UPDATE_CPU;
if (migratable)
flags |= VIR_DOMAIN_XML_MIGRATABLE;
+ if (snapshots)
+ flags |= VIR_DOMAIN_XML_SNAPSHOTS;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return false;
--
2.20.1
10:21 p.m.
New subject: [libvirt] [PATCH 6/7] domain: Add VIR_DOMAIN_XML_SNAPSHOTS flag
On 2/20/19 9:53 AM, Eric Blake wrote:
Right now, copying the state of a transient domain with snapshots
from one host to another requires multiple API calls on both
machines - on the host: get the domain XML, get a list of the
snapshots, and then for each snapshot get the snapshot's XML;
then on the destination: create the domain, then multiple
domain snapshot create calls with the REDEFINE flag. This
patch aims to make the process use fewer APIs by making it
possible to grab the XML for all snapshots at the same time as
grabbing the domain XML. Note that we had to do the modification
to virDomainGetXMLDesc(), rather than virDomainSnapshotGetXMLDesc(),
since the latter requires a single non-NULL snapshot object,
whereas we want the list of all snapshots for the domain (even
if the list has 0 elements).
Plumb the new flag into the test and qemu driver, and into virsh
dumpxml.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
include/libvirt/libvirt-domain.h | 1 +
src/conf/domain_conf.c | 13 ++++++++-----
src/libvirt-domain.c | 5 +++++
src/qemu/qemu_domain.c | 23 +++++++++++++++++------
src/qemu/qemu_driver.c | 4 ++--
src/test/test_driver.c | 7 ++++---
tools/virsh-domain.c | 7 +++++++
7 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
Needs this squashed in, now that I've rebased on top of the flag cleanups:
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index da0fde78a6..dad1db2eb9 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7727,7 +7727,8 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr
driver,
virQEMUCapsPtr qemuCaps = NULL;
bool snapshots = flags & VIR_DOMAIN_XML_SNAPSHOTS;
- virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS |
VIR_DOMAIN_XML_UPDATE_CPU, -1);
+ virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU |
+ VIR_DOMAIN_XML_SNAPSHOTS, -1);
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
9:53 a.m.
New subject: [libvirt] [PATCH 7/7] snapshot: Add VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST flag
Continue the work of the previous patch in making it possible
to copy the state of a transient domain with snapshots from one
host to another, by allowing the destination to perform bulk
redefines. Note that the destination still has to do separate
calls for creating/defining the domain first, and then redefining
the snapshots (that is, there is intentional asymmetry between
dumping the list in virDomainGetXMLDesc() but redefining it via
virDomainSnapshotCreateXML()), but this is better than the
previous state of having to make multiple REDEFINE calls. The
bulk flag requires no pre-existing snapshot metadata (as that
makes life much easier if there is a failure encountered partway
through the list processing - simply remove all other snapshot
metadatas), and makes no guarantees on which snapshot (when there
are multiple) will actually be returned.
Wire up the virsh snapshot-create command to support the new flag.
Actual driver implementations will be in later patches.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
include/libvirt/libvirt-domain-snapshot.h | 3 +++
src/libvirt-domain-snapshot.c | 21 ++++++++++++++++++---
tools/virsh-snapshot.c | 13 +++++++++++++
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/include/libvirt/libvirt-domain-snapshot.h
b/include/libvirt/libvirt-domain-snapshot.h
index 2532b99c58..113fe4a18b 100644
--- a/include/libvirt/libvirt-domain-snapshot.h
+++ b/include/libvirt/libvirt-domain-snapshot.h
@@ -71,6 +71,9 @@ typedef enum {
VIR_DOMAIN_SNAPSHOT_CREATE_LIVE = (1 << 8), /* create the snapshot
while the guest is
running */
+ VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST = (1 << 9), /* parse multiple
+ snapshots in one
+ API call */
} virDomainSnapshotCreateFlags;
/* Take a snapshot of the current VM state */
diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c
index 4e46f0876b..a661bcbff9 100644
--- a/src/libvirt-domain-snapshot.c
+++ b/src/libvirt-domain-snapshot.c
@@ -102,7 +102,7 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot)
* @flags: bitwise-OR of virDomainSnapshotCreateFlags
*
* Creates a new snapshot of a domain based on the snapshot xml
- * contained in xmlDesc.
+ * contained in xmlDesc, with a top-level <domainsnapshot> element.
*
* If @flags is 0, the domain can be active, in which case the
* snapshot will be a system checkpoint (both disk state and runtime
@@ -131,8 +131,17 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot)
* guest-visible layout. When redefining a snapshot name that does
* not exist, the hypervisor may validate that reverting to the
* snapshot appears to be possible (for example, disk images have
- * snapshot contents by the requested name). Not all hypervisors
- * support these flags.
+ * snapshot contents by the requested name). Alternatively, if @flags
+ * includes VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST (which requires
+ * VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and is incompatible with
+ * VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT), and the domain has no existing
+ * snapshot metadata, then @xmlDesc is parsed as a top-level
+ * <snapshots> element with an optional current='name' attribute, and
+ * containing one or more <domainsnapshot> children (as produced by
+ * virDomainGetXMLDesc() with the flag VIR_DOMAIN_XML_SNAPSHOTS), to
+ * do a bulk redefine of all snapshots at once (it is unspecified
+ * which of the redefined snapshots will be used as the return value
+ * on success). Not all hypervisors support these flags.
*
* If @flags includes VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA, then the
* domain's disk images are modified according to @xmlDesc, but then
@@ -218,6 +227,9 @@ virDomainSnapshotCreateXML(virDomainPtr domain,
VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT,
VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE,
error);
+ VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST,
+ VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE,
+ error);
VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE,
VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA,
@@ -225,6 +237,9 @@ virDomainSnapshotCreateXML(virDomainPtr domain,
VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE,
VIR_DOMAIN_SNAPSHOT_CREATE_HALT,
error);
+ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST,
+ VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT,
+ error);
if (conn->driver->domainSnapshotCreateXML) {
virDomainSnapshotPtr ret;
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 6cadb2b0d6..f6efadde2d 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -80,6 +80,13 @@ virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char
*buffer,
goto cleanup;
}
+ if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST) {
+ vshPrintExtra(ctl, "%s",
+ _("Domain snapshot list imported successfully"));
+ ret = true;
+ goto cleanup;
+ }
+
name = virDomainSnapshotGetName(snapshot);
if (!name) {
vshError(ctl, "%s", _("Could not get snapshot name"));
@@ -122,6 +129,10 @@ static const vshCmdOptDef opts_snapshot_create[] = {
.help = N_("redefine metadata for existing snapshot")
},
VIRSH_COMMON_OPT_CURRENT(N_("with redefine, set current snapshot")),
+ {.name = "redefine-list",
+ .type = VSH_OT_BOOL,
+ .help = N_("with redefine, bulk define a set of snapshots"),
+ },
{.name = "no-metadata",
.type = VSH_OT_BOOL,
.help = N_("take snapshot but create no metadata")
@@ -177,6 +188,8 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd)
flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC;
if (vshCommandOptBool(cmd, "live"))
flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE;
+ if (vshCommandOptBool(cmd, "redefine-list"))
+ flags |= VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
goto cleanup;
--
2.20.1
10:36 p.m.
New subject: [libvirt] [PATCH 7/7] snapshot: Add VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST flag
On 2/20/19 9:53 AM, Eric Blake wrote:
Continue the work of the previous patch in making it possible
to copy the state of a transient domain with snapshots from one
host to another, by allowing the destination to perform bulk
redefines. Note that the destination still has to do separate
calls for creating/defining the domain first, and then redefining
the snapshots (that is, there is intentional asymmetry between
dumping the list in virDomainGetXMLDesc() but redefining it via
virDomainSnapshotCreateXML()), but this is better than the
previous state of having to make multiple REDEFINE calls. The
bulk flag requires no pre-existing snapshot metadata (as that
makes life much easier if there is a failure encountered partway
through the list processing - simply remove all other snapshot
metadatas), and makes no guarantees on which snapshot (when there
are multiple) will actually be returned.
Wire up the virsh snapshot-create command to support the new flag.
Actual driver implementations will be in later patches.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
include/libvirt/libvirt-domain-snapshot.h | 3 +++
src/libvirt-domain-snapshot.c | 21 ++++++++++++++++++---
tools/virsh-snapshot.c | 13 +++++++++++++
3 files changed, 34 insertions(+), 3 deletions(-)
For convenience, I'll probably squash this in (while the API requires
both REDEFINE and REDEFINE_LIST flags, the virsh tooling can imply one
from the other):
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index f6efadde2d..a58731c46e 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -131,7 +131,7 @@ static const vshCmdOptDef opts_snapshot_create[] = {
VIRSH_COMMON_OPT_CURRENT(N_("with redefine, set current snapshot")),
{.name = "redefine-list",
.type = VSH_OT_BOOL,
- .help = N_("with redefine, bulk define a set of snapshots"),
+ .help = N_("bulk define a set of snapshots, implies --redefine"),
},
{.name = "no-metadata",
.type = VSH_OT_BOOL,
@@ -189,7 +189,8 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd)
if (vshCommandOptBool(cmd, "live"))
flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE;
if (vshCommandOptBool(cmd, "redefine-list"))
- flags |= VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST;
+ flags |= VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE |
+ VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE_LIST;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
goto cleanup;
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
2066
days inactive
2067
days old
10 comments
1 participants
participants (1)
-
Eric Blake