From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 25 Mar 2021 16:26:03 +0000 (+0100)
Subject: libxl: add API wrapper for libxl_domain_shutdown
X-Git-Tag: v7.3.0-rc1~388
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8a890a6a45d1df627c7c70941f679f42aa6ec01;p=thirdparty%2Flibvirt.git

libxl: add API wrapper for libxl_domain_shutdown

Upcoming changes will use different LIBXL_API_VERSION variants.

Prepare libxl_domain_shutdown, 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 4763947b50..8b25c3fc9e 100644
--- a/src/libxl/libxl_api_wrapper.h
+++ b/src/libxl/libxl_api_wrapper.h
@@ -58,3 +58,17 @@ libxlRetrieveDomainConfigurationWrapper(libxl_ctx *ctx,
 
     return ret;
 }
+
+static inline int
+libxlDomainShutdownWrapper(libxl_ctx *ctx, uint32_t domid)
+{
+    int ret;
+
+#if LIBXL_API_VERSION < 0x041300
+    ret = libxl_domain_shutdown(ctx, domid);
+#else
+    ret = libxl_domain_shutdown(ctx, domid, NULL);
+#endif
+
+    return ret;
+}
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 7f43625638..0a0881c133 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -37,6 +37,7 @@
 #include "viruuid.h"
 #include "virhook.h"
 #include "vircommand.h"
+#include "libxl_api_wrapper.h"
 #include "libxl_domain.h"
 #include "libxl_driver.h"
 #include "libxl_conf.h"
@@ -1292,7 +1293,7 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
         goto cleanup;
 
     if (flags & VIR_DOMAIN_SHUTDOWN_PARAVIRT) {
-        ret = libxl_domain_shutdown(cfg->ctx, vm->def->id);
+        ret = libxlDomainShutdownWrapper(cfg->ctx, vm->def->id);
         if (ret == 0)
             goto cleanup;