On Mon, May 02, 2016 at 07:01:17PM -0600, Jim Fehlig wrote: > 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 <jfeh...@suse.com>
Reviewed-by: Wei Liu <wei.l...@citrix.com> > --- > configure.ac | 9 +++++---- > src/libxl/libxl_domain.c | 6 +++++- > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 88e2e20..0da0f75 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -875,10 +875,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" > > diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c > index 14a900c..32ad946 100644 > --- a/src/libxl/libxl_domain.c > +++ b/src/libxl/libxl_domain.c > @@ -1028,6 +1028,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, > virDomainObjPtr vm, > 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 driver, > virDomainObjPtr vm, > 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); > > -- > 2.1.4 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel