Re: [libvirt] [PATCH] libxl: libxl_domain_create_restore has an extra argument

On 4/5/16 9:20 AM, Wei Liu wrote: > 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(a)citrix.com&gt; > --- > Build test with Xen 4.6.1 (old API) and Xen unstable (new API). > --- > src/libxl/libxl_domain.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c > index 04962a0..aed904b 100644 > --- a/src/libxl/libxl_domain.c > +++ b/src/libxl/libxl_domain.c > @@ -1070,7 +1070,12 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, > 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, > ACK This fixes integration testing that Xen Project does with libvirt and Xen so it would be nice to get in for 1.3.3.