From aaa93ab6faa178406d9a472f6002a6985e5ebc72 Mon Sep 17 00:00:00 2001 From: Osier Yang Date: Fri, 19 Aug 2011 21:49:37 +0800 Subject: [PATCH] qemu: Allow to undefine a running domain --- src/qemu/qemu_driver.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 421a98ecd7..c8dda73328 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4720,12 +4720,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, goto cleanup; } - if (virDomainObjIsActive(vm)) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot delete active domain")); - goto cleanup; - } - if (!vm->persistent) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot undefine transient domain")); @@ -4760,9 +4754,19 @@ qemuDomainUndefineFlags(virDomainPtr dom, VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); VIR_INFO("Undefining domain '%s'", vm->def->name); - virDomainRemoveInactive(&driver->domains, - vm); - vm = NULL; + + /* If the domain is active, keep it running but set it as transient. + * domainDestroy and domainShutdown will take care of removing the + * domain obj from the hash table. + */ + if (virDomainObjIsActive(vm)) { + vm->persistent = 0; + } else { + virDomainRemoveInactive(&driver->domains, + vm); + vm = NULL; + } + ret = 0; cleanup: -- GitLab