File libvirt.4d6e2c0f894b20c7560900bddf2ba8cea557b90... of Package libvirt-7.0.0

Overview Repositories Revisions Requests Users Attributes Meta

File libvirt.4d6e2c0f894b20c7560900bddf2ba8cea557b903.patch of Package libvirt-7.0.0

From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 25 Mar 2021 17:26:10 +0100
Subject: 4d6e2c0f894b20c7560900bddf2ba8cea557b903

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>
---
 src/libxl/libxl_api_wrapper.h | 17 +++++++++++++++++
 src/libxl/libxl_driver.c      |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

--- a/src/libxl/libxl_api_wrapper.h
+++ b/src/libxl/libxl_api_wrapper.h
@@ -162,12 +162,29 @@ static inline int
 libxlSetVcpuonlineWrapper(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap)
 {
     int ret;
 
 #if LIBXL_API_VERSION < 0x041300
     ret = libxl_set_vcpuonline(ctx, domid, cpumap);
 #else
     ret = libxl_set_vcpuonline(ctx, domid, cpumap, NULL);
 #endif
 
     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;
+}
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1299,26 +1299,26 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
 
         if (ret != ERROR_NOPARAVIRT) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Failed to shutdown domain '%d' with libxenlight"),
                            vm->def->id);
             ret = -1;
             goto cleanup;
         }
         ret = -1;
     }
 
     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;
 
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Failed to shutdown domain '%d' with libxenlight"),
                        vm->def->id);
         ret = -1;
     }
 
  cleanup:
     virDomainObjEndAPI(&vm);
     virObjectUnref(cfg);

Places

File libvirt.4d6e2c0f894b20c7560900bddf2ba8cea557b903.patch of Package libvirt-7.0.0

Places