vmware: Allow to undefine a running domain

b9736d5b · Osier Yang · b3b4aba5 · b9736d5b
隐藏空白更改
内联并排

Showing with 7 addition and 8 deletion

src/vmware/vmware_driver.c src/vmware/vmware_driver.c +7 -8

未找到文件。
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -639,20 +639,19 @@ vmwareDomainUndefineFlags(virDomainPtr dom,
        goto cleanup;
    }

-    if (virDomainObjIsActive(vm)) {
-        vmwareError(VIR_ERR_OPERATION_INVALID,
-                    "%s", _("cannot undefine active domain"));
-        goto cleanup;
-    }
-
    if (!vm->persistent) {
        vmwareError(VIR_ERR_OPERATION_INVALID,
                    "%s", _("cannot undefine transient domain"));
        goto cleanup;
    }

-    virDomainRemoveInactive(&driver->domains, vm);
-    vm = NULL;
+    if (virDomainObjIsActive(vm)) {
+        vm->persistent = 0;
+    } else {
+        virDomainRemoveInactive(&driver->domains, vm);
+        vm = NULL;
+    }
+
    ret = 0;

  cleanup: