提交 3959fe30 编写于 作者: M Michal Privoznik

destroy: Implement internal API for ESX driver

上级 427eaf13
...@@ -1937,7 +1937,8 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags) ...@@ -1937,7 +1937,8 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags)
static int static int
esxDomainDestroy(virDomainPtr domain) esxDomainDestroyFlags(virDomainPtr domain,
unsigned int flags)
{ {
int result = -1; int result = -1;
esxPrivate *priv = domain->conn->privateData; esxPrivate *priv = domain->conn->privateData;
...@@ -1949,6 +1950,8 @@ esxDomainDestroy(virDomainPtr domain) ...@@ -1949,6 +1950,8 @@ esxDomainDestroy(virDomainPtr domain)
esxVI_TaskInfoState taskInfoState; esxVI_TaskInfoState taskInfoState;
char *taskInfoErrorMessage = NULL; char *taskInfoErrorMessage = NULL;
virCheckFlags(0, -1);
if (priv->vCenter != NULL) { if (priv->vCenter != NULL) {
ctx = priv->vCenter; ctx = priv->vCenter;
} else { } else {
...@@ -2001,6 +2004,12 @@ esxDomainDestroy(virDomainPtr domain) ...@@ -2001,6 +2004,12 @@ esxDomainDestroy(virDomainPtr domain)
} }
static int
esxDomainDestroy(virDomainPtr dom)
{
return esxDomainDestroyFlags(dom, 0);
}
static char * static char *
esxDomainGetOSType(virDomainPtr domain ATTRIBUTE_UNUSED) esxDomainGetOSType(virDomainPtr domain ATTRIBUTE_UNUSED)
...@@ -4734,6 +4743,7 @@ static virDriver esxDriver = { ...@@ -4734,6 +4743,7 @@ static virDriver esxDriver = {
.domainShutdown = esxDomainShutdown, /* 0.7.0 */ .domainShutdown = esxDomainShutdown, /* 0.7.0 */
.domainReboot = esxDomainReboot, /* 0.7.0 */ .domainReboot = esxDomainReboot, /* 0.7.0 */
.domainDestroy = esxDomainDestroy, /* 0.7.0 */ .domainDestroy = esxDomainDestroy, /* 0.7.0 */
.domainDestroyFlags = esxDomainDestroyFlags, /* 0.9.4 */
.domainGetOSType = esxDomainGetOSType, /* 0.7.0 */ .domainGetOSType = esxDomainGetOSType, /* 0.7.0 */
.domainGetMaxMemory = esxDomainGetMaxMemory, /* 0.7.0 */ .domainGetMaxMemory = esxDomainGetMaxMemory, /* 0.7.0 */
.domainSetMaxMemory = esxDomainSetMaxMemory, /* 0.7.0 */ .domainSetMaxMemory = esxDomainSetMaxMemory, /* 0.7.0 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册