libxl: add API wrapper for libxl_retrieve_domain_configuration

Upcoming changes will use different LIBXL_API_VERSION variants.

Prepare libxl_retrieve_domain_configuration, which got a new parameter
"libxl_asyncop_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 3b988db5b906073a457b6e2def986643629e1157..4763947b50750f1d28610cb6b8a2b48ca76422c4 100644 (file)
--- a/src/libxl/libxl_api_wrapper.h
+++ b/src/libxl/libxl_api_wrapper.h
@@ -42,3 +42,19 @@ libxlDomainCreateRestoreWrapper(libxl_ctx *ctx,
 
     return ret;
 }
+
+static inline int
+libxlRetrieveDomainConfigurationWrapper(libxl_ctx *ctx,
+                                        uint32_t domid,
+                                        libxl_domain_config *d_config)
+{
+    int ret;
+
+#if LIBXL_API_VERSION < 0x041300
+    ret = libxl_retrieve_domain_configuration(ctx, domid, d_config);
+#else
+    ret = libxl_retrieve_domain_configuration(ctx, domid, d_config, NULL);
+#endif
+
+    return ret;
+}

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 9adba9f2bfd015ae4e3b65c1a6bee8b6c3c8b3e8..809108fd7dc388c511683954268a2f765c3b4142 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -572,8 +572,8 @@ libxlDomainShutdownThread(void *opaque)
     } else if (xl_reason == LIBXL_SHUTDOWN_REASON_SOFT_RESET) {
         libxlDomainObjPrivatePtr priv = vm->privateData;
 
-        if (libxl_retrieve_domain_configuration(cfg->ctx, vm->def->id,
-                                                &d_config) != 0) {
+        if (libxlRetrieveDomainConfigurationWrapper(cfg->ctx, vm->def->id,
+                                                    &d_config) != 0) {
             VIR_ERROR(_("Failed to retrieve config for VM '%s'. "
                         "Unable to perform soft reset. Destroying VM"),
                       vm->def->name);