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

Add missing cleanup for transient guests in UML driver

Browse Source 
The UML inotify handler would kill off guests when certain
conditions arise, but it forgot to remove transient guests
from the list of domains

* src/uml/uml_driver.c: Cleanup transient guests
This commit is contained in:
Daniel P. Berrange 2011-07-04 12:11:56 +01:00
parent f0c7103db5
commit 65d68f62f1
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/uml/uml_driver.c
View File

@ -311,6 +311,11 @@ reread:
umlShutdownVMDaemon(NULL, driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN);
virDomainAuditStop(dom, "shutdown");
if (!dom->persistent) {
virDomainRemoveInactive(&driver->domains,
dom);
dom = NULL;
}
} else if (e->mask & (IN_CREATE | IN_MODIFY)) {
VIR_DEBUG("Got inotify domain startup '%s'", name);
if (virDomainObjIsActive(dom)) {
@ -332,14 +337,25 @@ reread:
umlShutdownVMDaemon(NULL, driver, dom,
VIR_DOMAIN_SHUTOFF_FAILED);
virDomainAuditStop(dom, "failed");
if (!dom->persistent) {
virDomainRemoveInactive(&driver->domains,
dom);
dom = NULL;
}
} else if (umlIdentifyChrPTY(driver, dom) < 0) {
VIR_WARN("Could not identify charater devices for new domain");
VIR_WARN("Could not identify character devices for new domain");
umlShutdownVMDaemon(NULL, driver, dom,
VIR_DOMAIN_SHUTOFF_FAILED);
virDomainAuditStop(dom, "failed");
if (!dom->persistent) {
virDomainRemoveInactive(&driver->domains,
dom);
dom = NULL;
}
}
}
virDomainObjUnlock(dom);
if (dom)
virDomainObjUnlock(dom);
}
cleanup: