]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
libxl: initialize shutdown inhibit callback
authorMarek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Sat, 18 Jan 2020 02:37:42 +0000 (03:37 +0100)
committerJim Fehlig <jfehlig@suse.com>
Wed, 22 Jan 2020 03:57:35 +0000 (20:57 -0700)
The libxl driver already tries to call shutdown inhibit callback in the
right places, but only if it's set. That last part was missing,
resulting in premature shutdown when running libvirtd
--timeout=...

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
src/libxl/libxl_driver.c

index ef02a066d9b97b7d350079438fe29764edbd1794..eb166244ba38512f04c742928a9c2524e521e6f3 100644 (file)
@@ -648,8 +648,8 @@ libxlAddDom0(libxlDriverPrivatePtr driver)
 
 static int
 libxlStateInitialize(bool privileged,
-                     virStateInhibitCallback callback G_GNUC_UNUSED,
-                     void *opaque G_GNUC_UNUSED)
+                     virStateInhibitCallback callback,
+                     void *opaque)
 {
     libxlDriverConfigPtr cfg;
     char *driverConf = NULL;
@@ -670,6 +670,9 @@ libxlStateInitialize(bool privileged,
         return VIR_DRV_STATE_INIT_ERROR;
     }
 
+    libxl_driver->inhibitCallback = callback;
+    libxl_driver->inhibitOpaque = opaque;
+
     /* Allocate bitmap for vnc port reservation */
     if (!(libxl_driver->reservedGraphicsPorts =
           virPortAllocatorRangeNew(_("VNC"),