SHA256
1
0
forked from pool/libvirt
libvirt/216650f1-libxl-build-fix.patch

35 lines
1.6 KiB
Diff
Raw Normal View History

commit 216650f14b35ad11a45505405347f8027bc294d7
Author: Wei Liu <wei.liu2@citrix.com>
Date: Tue Apr 5 15:20:12 2016 +0100
libxl: libxl_domain_create_restore has an extra argument
In the latest libxenlight code, libxl_domain_create_restore accepts a
new argument. Update libvirt's libxl driver for that. Use the macro
provided by libxenlight to detect which version should be used.
The new parameter (send_back_fd) is set to -1 because libvirt provides
no such fd.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Message-id: 1459866012-27081-1-git-send-email-wei.liu2@citrix.com
Index: libvirt-1.3.3/src/libxl/libxl_domain.c
===================================================================
--- libvirt-1.3.3.orig/src/libxl/libxl_domain.c
+++ libvirt-1.3.3/src/libxl/libxl_domain.c
@@ -1070,7 +1070,12 @@ libxlDomainStart(libxlDriverPrivatePtr d
ret = libxl_domain_create_new(cfg->ctx, &d_config,
&domid, NULL, &aop_console_how);
} else {
-#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS
+#if defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_SEND_BACK_FD)
+ params.checkpointed_stream = 0;
+ ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid,
+ restore_fd, -1, &params, NULL,
+ &aop_console_how);
+#elif defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS)
params.checkpointed_stream = 0;
ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid,
restore_fd, &params, NULL,