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

xen: Allow to undefine a running domain (xm_internal)

Browse Source
This commit is contained in:
Osier Yang 2011-08-19 21:53:39 +08:00
parent b9736d5b21
commit 49186deda6
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/xen/xm_internal.c
View File

@ -1218,8 +1218,6 @@ int xenXMDomainUndefine(virDomainPtr domain) {
return (-1); return (-1);
} }
if (domain->id != -1)
return (-1);
if (domain->conn->flags & VIR_CONNECT_RO) if (domain->conn->flags & VIR_CONNECT_RO)
return (-1); return (-1);
@ -1235,6 +1233,9 @@ int xenXMDomainUndefine(virDomainPtr domain) {
if (unlink(entry->filename) < 0) if (unlink(entry->filename) < 0)
goto cleanup; goto cleanup;
if (virDomainObjIsActive(vm)) {
vm->persistent = 0;
} else {
/* Remove the name -> filename mapping */ /* Remove the name -> filename mapping */
if (virHashRemoveEntry(priv->nameConfigMap, domain->name) < 0) if (virHashRemoveEntry(priv->nameConfigMap, domain->name) < 0)
goto cleanup; goto cleanup;
@ -1242,6 +1243,7 @@ int xenXMDomainUndefine(virDomainPtr domain) {
/* Remove the config record itself */ /* Remove the config record itself */
if (virHashRemoveEntry(priv->configCache, entry->filename) < 0) if (virHashRemoveEntry(priv->configCache, entry->filename) < 0)
goto cleanup; goto cleanup;
}
ret = 0; ret = 0;