NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vz: drop prlsdkDomainHasSnapshots

Browse Source 
Let's use introduced domain snapshots infrastructure instead.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2016-05-02 12:33:08 +03:00 committed by Maxim Nestratov
parent abc85b2cab
commit d6734879c0
1 changed files with 18 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/vz/vz_sdk.c
View File

@ -3838,75 +3838,16 @@ prlsdkDetachDomainHardDisks(PRL_HANDLE sdkdom)
return ret; return ret;
} }
/**
* prlsdkDomainHasSnapshots:
*
* This function detects where a domain specified by @sdkdom
* has snapshots. It doesn't count them correctly.
*
* @sdkdom: domain handle
* @found: a value more than zero if snapshots present
*
* Returns 0 if function succeeds, -1 otherwise.
*/
static int
prlsdkDomainHasSnapshots(PRL_HANDLE sdkdom, int* found)
{
int ret = -1;
PRL_RESULT pret;
PRL_HANDLE job;
PRL_HANDLE result;
char *snapshotxml = NULL;
unsigned int paramsCount;
xmlDocPtr xml = NULL;
xmlXPathContextPtr ctxt = NULL;
if (!found)
goto cleanup;
job = PrlVm_GetSnapshotsTreeEx(sdkdom, PGST_WITHOUT_SCREENSHOTS);
if (PRL_FAILED(getJobResult(job, &result)))
goto cleanup;
pret = PrlResult_GetParamsCount(result, &paramsCount);
prlsdkCheckRetGoto(pret, cleanup);
if (!paramsCount)
goto cleanup;
if (!(snapshotxml = prlsdkGetStringParamVar(PrlResult_GetParamAsString,
result)))
goto cleanup;
if (*snapshotxml == '\0') {
/* The document is empty that means no snapshots */
*found = 0;
ret = 0;
goto cleanup;
}
if (!(xml = virXMLParseStringCtxt(snapshotxml, "SavedStateItem", &ctxt)))
goto cleanup;
*found = virXMLChildElementCount(ctxt->node);
ret = 0;
cleanup:
xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml);
VIR_FREE(snapshotxml);
return ret;
}
int int
prlsdkUnregisterDomain(vzDriverPtr driver, virDomainObjPtr dom, unsigned int flags) prlsdkUnregisterDomain(vzDriverPtr driver, virDomainObjPtr dom, unsigned int flags)
{ {
vzDomObjPtr privdom = dom->privateData; vzDomObjPtr privdom = dom->privateData;
PRL_HANDLE job; PRL_HANDLE job;
size_t i; size_t i;
int snapshotfound = 0; virDomainSnapshotObjListPtr snapshots = NULL;
VIRTUAL_MACHINE_STATE domainState; VIRTUAL_MACHINE_STATE domainState;
int ret = -1;
int num;
if (prlsdkGetDomainState(privdom->sdkdom, &domainState) < 0) if (prlsdkGetDomainState(privdom->sdkdom, &domainState) < 0)
return -1; return -1;
@ -3920,31 +3861,39 @@ prlsdkUnregisterDomain(vzDriverPtr driver, virDomainObjPtr dom, unsigned int fla
return -1; return -1;
} }
if (prlsdkDomainHasSnapshots(privdom->sdkdom, &snapshotfound) < 0) if (!(snapshots = prlsdkLoadSnapshots(dom)))
return -1; return -1;
if (snapshotfound && !(flags & VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA)) { if ((num = virDomainSnapshotObjListNum(snapshots, NULL, 0)) < 0)
goto cleanup;
if (num > 0 && !(flags & VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("Refusing to undefine while snapshots exist")); _("Refusing to undefine while snapshots exist"));
return -1; goto cleanup;
} }
if (prlsdkDetachDomainHardDisks(privdom->sdkdom)) if (prlsdkDetachDomainHardDisks(privdom->sdkdom))
return -1; goto cleanup;
job = PrlVm_Delete(privdom->sdkdom, PRL_INVALID_HANDLE); job = PrlVm_Delete(privdom->sdkdom, PRL_INVALID_HANDLE);
if (PRL_FAILED(waitJob(job))) if (PRL_FAILED(waitJob(job)))
return -1; goto cleanup;
for (i = 0; i < dom->def->nnets; i++) for (i = 0; i < dom->def->nnets; i++)
prlsdkCleanupBridgedNet(driver, dom->def->nets[i]); prlsdkCleanupBridgedNet(driver, dom->def->nets[i]);
if (prlsdkSendEvent(driver, dom, VIR_DOMAIN_EVENT_UNDEFINED, if (prlsdkSendEvent(driver, dom, VIR_DOMAIN_EVENT_UNDEFINED,
VIR_DOMAIN_EVENT_UNDEFINED_REMOVED) < 0) VIR_DOMAIN_EVENT_UNDEFINED_REMOVED) < 0)
return -1; goto cleanup;
virDomainObjListRemove(driver->domains, dom); virDomainObjListRemove(driver->domains, dom);
return 0;
ret = 0;
cleanup:
virDomainSnapshotObjListFree(snapshots);
return ret;
} }
int int