External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

esx: Destroy virtual machine on a vCenter if available

Browse Source 
If a virtual machine is destroyed on a ESX server then immediately
undefining this virtual machine on a vCenter may fail, because the
vCenter has not been informed about the status change yet. Therefore,
destroy a virtual machine on a vCenter if available, so the vCenter
is up-to-date when the virtual machine should be undefined.
This commit is contained in:
Matthias Bolte 2009-12-12 20:51:35 +01:00
parent 46306c9c85
commit 470764f0b4
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/esx/esx_driver.c
View File

@ -1499,21 +1499,28 @@ esxDomainDestroy(virDomainPtr domain)
{
int result = 0;
esxPrivate *priv = (esxPrivate *)domain->conn->privateData;
esxVI_Context *ctx = NULL;
esxVI_ObjectContent *virtualMachine = NULL;
esxVI_String *propertyNameList = NULL;
esxVI_VirtualMachinePowerState powerState;
esxVI_ManagedObjectReference *task = NULL;
esxVI_TaskInfoState taskInfoState;
if (esxVI_EnsureSession(domain->conn, priv->host) < 0) {
if (priv->vCenter != NULL) {
ctx = priv->vCenter;
} else {
ctx = priv->host;
}
if (esxVI_EnsureSession(domain->conn, ctx) < 0) {
goto failure;
}
if (esxVI_String_AppendValueToList(domain->conn, &propertyNameList,
"runtime.powerState") < 0 ||
esxVI_LookupVirtualMachineByUuidAndPrepareForTask
(domain->conn, priv->host, domain->uuid, propertyNameList,
&virtualMachine, priv->autoAnswer) < 0 ||
(domain->conn, ctx, domain->uuid, propertyNameList, &virtualMachine,
priv->autoAnswer) < 0 ||
esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
&powerState) < 0) {
goto failure;
@ -1525,11 +1532,10 @@ esxDomainDestroy(virDomainPtr domain)
goto failure;
}
if (esxVI_PowerOffVM_Task(domain->conn, priv->host, virtualMachine->obj,
if (esxVI_PowerOffVM_Task(domain->conn, ctx, virtualMachine->obj,
&task) < 0 ||
esxVI_WaitForTaskCompletion(domain->conn, priv->host, task,
domain->uuid, priv->autoAnswer,
&taskInfoState) < 0) {
esxVI_WaitForTaskCompletion(domain->conn, ctx, task, domain->uuid,
priv->autoAnswer, &taskInfoState) < 0) {
goto failure;
}