mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-30 09:53:10 +00:00
vbox: Close media when undefining domains
When registering a VM we call OpenMedium on each disk image which adds it to vbox's global media registry. Therefore, we should make sure to call Close when unregistering VM so we cleanup the media registry entries after ourselves - this does not remove disk image files. This follows the behaviour of the VBoxManage unregistervm command.
This commit is contained in:
parent
6f8ddbb83b
commit
7651debbc1
@ -400,6 +400,8 @@ _unregisterMachine(vboxDriverPtr data, vboxIID *iid, IMachine **machine)
|
||||
{
|
||||
nsresult rc;
|
||||
vboxArray media = VBOX_ARRAY_INITIALIZER;
|
||||
size_t i;
|
||||
|
||||
rc = data->vboxObj->vtbl->FindMachine(data->vboxObj, iid->value, machine);
|
||||
if (NS_FAILED(rc)) {
|
||||
virReportError(VIR_ERR_NO_DOMAIN, "%s",
|
||||
@ -407,12 +409,24 @@ _unregisterMachine(vboxDriverPtr data, vboxIID *iid, IMachine **machine)
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* We're not interested in the array returned by the Unregister method,
|
||||
* but in the side effect of unregistering the virtual machine. In order
|
||||
* to call the Unregister method correctly we need to use the vboxArray
|
||||
* wrapper here. */
|
||||
rc = vboxArrayGetWithUintArg(&media, *machine, (*machine)->vtbl->Unregister,
|
||||
CleanupMode_DetachAllReturnNone);
|
||||
CleanupMode_DetachAllReturnHardDisksOnly);
|
||||
|
||||
if (NS_FAILED(rc))
|
||||
goto cleanup;
|
||||
|
||||
/* close each medium attached to VM to remove from media registry */
|
||||
for (i = 0; i < media.count; i++) {
|
||||
IMedium *medium = media.items[i];
|
||||
|
||||
if (!medium)
|
||||
continue;
|
||||
|
||||
/* it's ok to ignore failure here - e.g. it may be used by another VM */
|
||||
ignore_value(medium->vtbl->Close(medium));
|
||||
}
|
||||
|
||||
cleanup:
|
||||
vboxArrayUnalloc(&media);
|
||||
return rc;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user