libxl: add API wrapper for libxl_send_trigger

Upcoming changes will use different LIBXL_API_VERSION variants.

Prepare libxl_send_trigger, which got a new parameter
"ao_how" in Xen 4.12. libvirt does not use this parameter.

No functional change intended.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>

diff --git a/src/libxl/libxl_api_wrapper.h b/src/libxl/libxl_api_wrapper.h
index 047089ed25a48b15e75c03b91f3a1a4f68062a26..26c2215cb758cc7e15ac62a47103d2a2d002cf7d 100644 (file)
--- a/src/libxl/libxl_api_wrapper.h
+++ b/src/libxl/libxl_api_wrapper.h
@@ -171,3 +171,20 @@ libxlSetVcpuonlineWrapper(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap)
 
     return ret;
 }
+
+static inline int
+libxlSendTriggerWrapper(libxl_ctx *ctx,
+                        uint32_t domid,
+                        libxl_trigger trigger,
+                        uint32_t vcpuid)
+{
+    int ret;
+
+#if LIBXL_API_VERSION < 0x041300
+    ret = libxl_send_trigger(ctx, domid, trigger, vcpuid);
+#else
+    ret = libxl_send_trigger(ctx, domid, trigger, vcpuid, NULL);
+#endif
+
+    return ret;
+}

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index f66c8b949afc68d0ab18deade69064372fdfa970..173f9ebe04da76fd31ecc6890b30c933cca45dba 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1308,8 +1308,8 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
     }
 
     if (flags & VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) {
-        ret = libxl_send_trigger(cfg->ctx, vm->def->id,
-                                 LIBXL_TRIGGER_POWER, 0);
+        ret = libxlSendTriggerWrapper(cfg->ctx, vm->def->id,
+                                      LIBXL_TRIGGER_POWER, 0);
         if (ret == 0)
             goto cleanup;