[libvirt] [PATCH 55/66] vbox: Rewrite vboxDomainHasCurrentSnapshot

--- src/vbox/vbox_common.c | 32 ++++++++++++++++++++++++++++++++ src/vbox/vbox_tmpl.c | 38 -------------------------------------- src/vbox/vbox_uniformed_api.h | 1 + 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 5178cda..cb6ba78 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -6226,3 +6226,35 @@ vboxDomainSnapshotLookupByName(virDomainPtr dom, const char *name, vboxIIDUnalloc(&iid); return ret; } + +int vboxDomainHasCurrentSnapshot(virDomainPtr dom, + unsigned int flags) +{ + VBOX_OBJECT_CHECK(dom->conn, int, -1); + vboxIIDUnion iid; + IMachine *machine = NULL; + ISnapshot *snapshot = NULL; + nsresult rc; + + virCheckFlags(0, -1); + + if (openSessionForMachine(data, dom->uuid, &iid, &machine, false) < 0) + goto cleanup; + + rc = gVBoxAPI.UIMachine.GetCurrentSnapshot(machine, &snapshot); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("could not get current snapshot")); + goto cleanup; + } + + if (snapshot) + ret = 1; + else + ret = 0; + + cleanup: + VBOX_RELEASE(machine); + vboxIIDUnalloc(&iid); + return ret; +} diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 5aef7dd..73b3fc3 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1522,44 +1522,6 @@ vboxDomainSnapshotGet(vboxGlobalData *data, return snapshot; } -static int -vboxDomainHasCurrentSnapshot(virDomainPtr dom, - unsigned int flags) -{ - VBOX_OBJECT_CHECK(dom->conn, int, -1); - vboxIID iid = VBOX_IID_INITIALIZER; - IMachine *machine = NULL; - ISnapshot *snapshot = NULL; - nsresult rc; - - virCheckFlags(0, -1); - - 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; - } - - rc = machine->vtbl->GetCurrentSnapshot(machine, &snapshot); - if (NS_FAILED(rc)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not get current snapshot")); - goto cleanup; - } - - if (snapshot) - ret = 1; - else - ret = 0; - - cleanup: - VBOX_RELEASE(machine); - vboxIIDUnalloc(&iid); - return ret; -} - static virDomainSnapshotPtr vboxDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags) diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index afbc351..d91e970 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -583,6 +583,7 @@ int vboxDomainSnapshotListNames(virDomainPtr dom, char **names, virDomainSnapshotPtr vboxDomainSnapshotLookupByName(virDomainPtr dom, const char *name, unsigned int flags); +int vboxDomainHasCurrentSnapshot(virDomainPtr dom, unsigned int flags); /* Version specified functions for installing uniformed API */ void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); -- 1.7.9.5