External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

uml: Allow to undefine a running domain

Browse Source
This commit is contained in:
Osier Yang 2011-08-19 21:51:42 +08:00
parent 7d3390f802
commit b3b4aba5d4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/uml/uml_driver.c
View File

@ -1806,12 +1806,6 @@ static int umlDomainUndefineFlags(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
if (virDomainObjIsActive(vm)) {
umlReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot delete active domain"));
goto cleanup;
}
if (!vm->persistent) { if (!vm->persistent) {
umlReportError(VIR_ERR_OPERATION_INVALID, "%s", umlReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot undefine transient domain")); _("cannot undefine transient domain"));
@ -1821,9 +1815,13 @@ static int umlDomainUndefineFlags(virDomainPtr dom,
if (virDomainDeleteConfig(driver->configDir, driver->autostartDir, vm) < 0) if (virDomainDeleteConfig(driver->configDir, driver->autostartDir, vm) < 0)
goto cleanup; goto cleanup;
virDomainRemoveInactive(&driver->domains, if (virDomainObjIsActive(vm)) {
vm); vm->persistent = 0;
vm = NULL; } else {
virDomainRemoveInactive(&driver->domains, vm);
vm = NULL;
}
ret = 0; ret = 0;
cleanup: cleanup: