59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
commit fccf27253cedd131c5c4720d31d96ecc68c20e59
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Thu Apr 28 21:08:28 2016 -0600
|
|
|
|
libxl: switch to using libxl_domain_create_restore from v4.4 API
|
|
|
|
In LIBXL_API_VERSION 0x040400, the libxl_domain_create_restore API
|
|
gained a parameter for specifying restore parameters. Switch to
|
|
using version 0x040400, which will be useful in a subsequent commit
|
|
to specify the Xen migration stream version when restoring.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
|
|
Index: libvirt-1.3.4/configure.ac
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/configure.ac
|
|
+++ libvirt-1.3.4/configure.ac
|
|
@@ -919,10 +919,11 @@ if test "$with_libxl" != "no" ; then
|
|
fi
|
|
fi
|
|
|
|
-# Until there is a need to use enhancements of libxl APIs such as
|
|
-# libxl_domain_create_restore and libxl_set_vcpuaffinity, stick with
|
|
-# the APIs as defined in libxl API version 4.2.0.
|
|
-LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040200"
|
|
+# LIBXL_API_VERSION 4.4.0 introduced a new parameter to
|
|
+# libxl_domain_create_restore for specifying restore parameters.
|
|
+# The libxl driver will make use of this new parameter for specifying
|
|
+# the Xen migration stream version.
|
|
+LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040400"
|
|
LIBS="$old_LIBS"
|
|
CFLAGS="$old_CFLAGS"
|
|
|
|
Index: libvirt-1.3.4/src/libxl/libxl_domain.c
|
|
===================================================================
|
|
--- libvirt-1.3.4.orig/src/libxl/libxl_domain.c
|
|
+++ libvirt-1.3.4/src/libxl/libxl_domain.c
|
|
@@ -1028,6 +1028,7 @@ libxlDomainStart(libxlDriverPrivatePtr d
|
|
libxlDriverConfigPtr cfg;
|
|
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
|
libxl_asyncprogress_how aop_console_how;
|
|
+ libxl_domain_restore_params params;
|
|
|
|
libxl_domain_config_init(&d_config);
|
|
|
|
@@ -1115,8 +1116,11 @@ libxlDomainStart(libxlDriverPrivatePtr d
|
|
ret = libxl_domain_create_new(cfg->ctx, &d_config,
|
|
&domid, NULL, &aop_console_how);
|
|
} else {
|
|
+ libxl_domain_restore_params_init(¶ms);
|
|
ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid,
|
|
- restore_fd, NULL, &aop_console_how);
|
|
+ restore_fd, ¶ms, NULL,
|
|
+ &aop_console_how);
|
|
+ libxl_domain_restore_params_dispose(¶ms);
|
|
}
|
|
virObjectLock(vm);
|
|
|