[PATCH v2 2/5] uml: Fix umlInotifyEvent dom object handling

[John Ferlan <jferlan@xxxxxxxxxx>]

The virDomainObjListFindByName will return a locked and reffed
object. If we call virDomainObjListRemove that will unlock the
object upon return, thus we need to relock the object before
making the call to virDomainObjEndAPI.

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/uml/uml_driver.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index ff2e7ac66b..b84585d728 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -346,8 +346,10 @@ umlInotifyEvent(int watch,
             event = virDomainEventLifecycleNewFromObj(dom,
                                              VIR_DOMAIN_EVENT_STOPPED,
                                              VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN);
-            if (!dom->persistent)
+            if (!dom->persistent) {
                 virDomainObjListRemove(driver->domains, dom);
+                virObjectLock(dom);
+            }
         } else if (e.mask & (IN_CREATE | IN_MODIFY)) {
             VIR_DEBUG("Got inotify domain startup '%s'", name);
             if (virDomainObjIsActive(dom)) {
@@ -377,8 +379,10 @@ umlInotifyEvent(int watch,
                 event = virDomainEventLifecycleNewFromObj(dom,
                                                  VIR_DOMAIN_EVENT_STOPPED,
                                                  VIR_DOMAIN_EVENT_STOPPED_FAILED);
-                if (!dom->persistent)
+                if (!dom->persistent) {
                     virDomainObjListRemove(driver->domains, dom);
+                    virObjectLock(dom);
+                }
             } else if (umlIdentifyChrPTY(driver, dom) < 0) {
                 VIR_WARN("Could not identify character devices for new domain");
                 umlShutdownVMDaemon(driver, dom,
@@ -387,8 +391,10 @@ umlInotifyEvent(int watch,
                 event = virDomainEventLifecycleNewFromObj(dom,
                                                  VIR_DOMAIN_EVENT_STOPPED,
                                                  VIR_DOMAIN_EVENT_STOPPED_FAILED);
-                if (!dom->persistent)
+                if (!dom->persistent) {
                     virDomainObjListRemove(driver->domains, dom);
+                    virObjectLock(dom);
+                }
             }
         }
         virDomainObjEndAPI(&dom);
-- 
2.13.6

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list