]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
uml: Allow to undefine a running domain
authorOsier Yang <jyang@redhat.com>
Fri, 19 Aug 2011 13:51:42 +0000 (21:51 +0800)
committerOsier Yang <jyang@redhat.com>
Fri, 19 Aug 2011 13:51:42 +0000 (21:51 +0800)
src/uml/uml_driver.c

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