vbox: Rewrite vboxSnapshotLookupByName

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 35ca0dcac86a867f12a16b63e75455528b6b608a..676e73ab8970b3a0d0940728c6f6bee102c7b6cd 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -6188,3 +6188,29 @@ int vboxDomainSnapshotListNames(virDomainPtr dom, char **names,
     vboxIIDUnalloc(&iid);
     return ret;
 }
+
+virDomainSnapshotPtr
+vboxDomainSnapshotLookupByName(virDomainPtr dom, const char *name,
+                               unsigned int flags)
+{
+    VBOX_OBJECT_CHECK(dom->conn, virDomainSnapshotPtr, NULL);
+    vboxIIDUnion iid;
+    IMachine *machine = NULL;
+    ISnapshot *snapshot = NULL;
+
+    virCheckFlags(0, NULL);
+
+    if (openSessionForMachine(data, dom->uuid, &iid, &machine, false) < 0)
+        goto cleanup;
+
+    if (!(snapshot = vboxDomainSnapshotGet(data, dom, machine, name)))
+        goto cleanup;
+
+    ret = virGetDomainSnapshot(dom, name);
+
+ cleanup:
+    VBOX_RELEASE(snapshot);
+    VBOX_RELEASE(machine);
+    vboxIIDUnalloc(&iid);
+    return ret;
+}

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index ad26f9b1a85cf6945f3abcd8032b87d79a574f35..c52a2cd79a0e73790cca7f8ecfb12a5266a426ea 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -1523,39 +1523,6 @@ vboxDomainSnapshotGet(vboxGlobalData *data,
     return snapshot;
 }
 
-static virDomainSnapshotPtr
-vboxDomainSnapshotLookupByName(virDomainPtr dom,
-                               const char *name,
-                               unsigned int flags)
-{
-    VBOX_OBJECT_CHECK(dom->conn, virDomainSnapshotPtr, NULL);
-    vboxIID iid = VBOX_IID_INITIALIZER;
-    IMachine *machine = NULL;
-    ISnapshot *snapshot = NULL;
-    nsresult rc;
-
-    virCheckFlags(0, NULL);
-
-    vboxIIDFromUUID(&iid, dom->uuid);
-    rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine);
-    if (NS_FAILED(rc)) {
-        virReportError(VIR_ERR_NO_DOMAIN, "%s",
-                       _("no domain with matching UUID"));
-        goto cleanup;
-    }
-
-    if (!(snapshot = vboxDomainSnapshotGet(data, dom, machine, name)))
-        goto cleanup;
-
-    ret = virGetDomainSnapshot(dom, name);
-
- cleanup:
-    VBOX_RELEASE(snapshot);
-    VBOX_RELEASE(machine);
-    vboxIIDUnalloc(&iid);
-    return ret;
-}
-
 static int
 vboxDomainHasCurrentSnapshot(virDomainPtr dom,
                              unsigned int flags)

diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index f0cfb183390105a4433ef3c60268d4eba5f533d2..afbc3517fe168ac36083d6fd37d9ce1f9bc689b9 100644 (file)
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -580,6 +580,9 @@ char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
 int vboxDomainSnapshotNum(virDomainPtr dom, unsigned int flags);
 int vboxDomainSnapshotListNames(virDomainPtr dom, char **names,
                                 int nameslen, unsigned int flags);
+virDomainSnapshotPtr
+vboxDomainSnapshotLookupByName(virDomainPtr dom, const char *name,
+                               unsigned int flags);
 
 /* Version specified functions for installing uniformed API */
 void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);