4:56 p.m.
The next patch will make snapshot creation more complex, so it's
better to avoid repetition of the complexity.
* tools/virsh.c (vshSnapshotCreate): New helper function.
(cmdSnapshotCreate, cmdSnapshotCreateAs): Use it.
---
This patch requires a prerequisite series:
https://www.redhat.com/archives/libvir-list/2011-August/msg00817.html
tools/virsh.c | 119 ++++++++++++++++++++++++---------------------------------
1 files changed, 50 insertions(+), 69 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index c803eea..e2f08ca 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -12082,6 +12082,54 @@ cmdQuit(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
return true;
}
+/* Helper for snapshot-create and snapshot-create-as */
+static bool
+vshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer,
+ unsigned int flags, const char *from)
+{
+ bool ret = false;
+ virDomainSnapshotPtr snapshot;
+ char *doc = NULL;
+ xmlDocPtr xml = NULL;
+ xmlXPathContextPtr ctxt = NULL;
+ char *name = NULL;
+
+ snapshot = virDomainSnapshotCreateXML(dom, buffer, flags);
+ if (snapshot == NULL)
+ goto cleanup;
+
+ doc = virDomainSnapshotGetXMLDesc(snapshot, 0);
+ if (!doc)
+ goto cleanup;
+
+ xml = virXMLParseStringCtxt(doc, "domainsnapshot.xml", &ctxt);
+ if (!xml)
+ goto cleanup;
+
+ name = virXPathString("string(/domainsnapshot/name)", ctxt);
+ if (!name) {
+ vshError(ctl, "%s",
+ _("Could not find 'name' element in domain snapshot
XML"));
+ goto cleanup;
+ }
+
+ if (from)
+ vshPrint(ctl, _("Domain snapshot %s created from '%s'"), name,
from);
+ else
+ vshPrint(ctl, _("Domain snapshot %s created"), name);
+
+ ret = true;
+
+cleanup:
+ VIR_FREE(name);
+ xmlXPathFreeContext(ctxt);
+ xmlFreeDoc(xml);
+ if (snapshot)
+ virDomainSnapshotFree(snapshot);
+ VIR_FREE(doc);
+ return ret;
+}
+
/*
* "snapshot-create" command
*/
@@ -12104,11 +12152,6 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd)
bool ret = false;
const char *from = NULL;
char *buffer = NULL;
- virDomainSnapshotPtr snapshot = NULL;
- xmlDocPtr xml = NULL;
- xmlXPathContextPtr ctxt = NULL;
- char *doc = NULL;
- char *name = NULL;
if (!vshConnectionUsability(ctl, ctl->conn))
goto cleanup;
@@ -12134,39 +12177,9 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
}
- snapshot = virDomainSnapshotCreateXML(dom, buffer, 0);
- if (snapshot == NULL)
- goto cleanup;
-
- doc = virDomainSnapshotGetXMLDesc(snapshot, 0);
- if (!doc)
- goto cleanup;
-
- xml = virXMLParseStringCtxt(doc, "domainsnapshot.xml", &ctxt);
- if (!xml)
- goto cleanup;
-
- name = virXPathString("string(/domainsnapshot/name)", ctxt);
- if (!name) {
- vshError(ctl, "%s",
- _("Could not find 'name' element in domain snapshot
XML"));
- goto cleanup;
- }
-
- vshPrint(ctl, _("Domain snapshot %s created"), name);
- if (from)
- vshPrint(ctl, _(" from '%s'"), from);
- vshPrint(ctl, "\n");
-
- ret = true;
+ ret = vshSnapshotCreate(ctl, dom, buffer, 0, from);
cleanup:
- VIR_FREE(name);
- xmlXPathFreeContext(ctxt);
- xmlFreeDoc(xml);
- if (snapshot)
- virDomainSnapshotFree(snapshot);
- VIR_FREE(doc);
VIR_FREE(buffer);
if (dom)
virDomainFree(dom);
@@ -12197,13 +12210,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd)
virDomainPtr dom = NULL;
bool ret = false;
char *buffer = NULL;
- virDomainSnapshotPtr snapshot = NULL;
- xmlDocPtr xml = NULL;
- xmlXPathContextPtr ctxt = NULL;
- char *doc = NULL;
const char *name = NULL;
const char *desc = NULL;
- char *parsed_name = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER;
if (!vshConnectionUsability(ctl, ctl->conn))
@@ -12238,36 +12246,9 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
}
- snapshot = virDomainSnapshotCreateXML(dom, buffer, 0);
- if (snapshot == NULL)
- goto cleanup;
-
- doc = virDomainSnapshotGetXMLDesc(snapshot, 0);
- if (!doc)
- goto cleanup;
-
- xml = virXMLParseStringCtxt(doc, "domainsnapshot.xml", &ctxt);
- if (!xml)
- goto cleanup;
-
- parsed_name = virXPathString("string(/domainsnapshot/name)", ctxt);
- if (!parsed_name) {
- vshError(ctl, "%s",
- _("Could not find 'name' element in domain snapshot
XML"));
- goto cleanup;
- }
-
- vshPrint(ctl, _("Domain snapshot %s created\n"), name ? name :
parsed_name);
-
- ret = true;
+ ret = vshSnapshotCreate(ctl, dom, buffer, 0, NULL);
cleanup:
- VIR_FREE(parsed_name);
- xmlXPathFreeContext(ctxt);
- xmlFreeDoc(xml);
- if (snapshot)
- virDomainSnapshotFree(snapshot);
- VIR_FREE(doc);
VIR_FREE(buffer);
if (dom)
virDomainFree(dom);
--
1.7.4.4