]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix incorrect variable passed to LXC event callback
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 12 Nov 2009 14:13:33 +0000 (14:13 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 13 Nov 2009 11:50:14 +0000 (11:50 +0000)
The wrong variable was being passed in with the LXC event callback
resulting in a later deadlock or crash

* src/lxc/lxc_driver.c: Pass 'vm' instead of 'driver' to event
  callback

src/lxc/lxc_driver.c

index d0fc01a316ba25615812811dce590a27f400804f..138c6fc04c401ad8099c15a04789807ed5440f66 100644 (file)
@@ -942,7 +942,8 @@ static void lxcMonitorEvent(int watch,
     }
 
 cleanup:
-    virDomainObjUnlock(vm);
+    if (vm)
+        virDomainObjUnlock(vm);
     if (event) {
         lxcDriverLock(driver);
         lxcDomainEventQueue(driver, event);
@@ -1226,7 +1227,7 @@ static int lxcVmStart(virConnectPtr conn,
              vm->monitor,
              VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP,
              lxcMonitorEvent,
-             driver, NULL)) < 0) {
+             vm, NULL)) < 0) {
         lxcVmTerminate(conn, driver, vm, 0);
         goto cleanup;
     }