From: Wei Liu Date: Tue, 5 Apr 2016 14:20:12 +0000 (+0100) Subject: libxl: libxl_domain_create_restore has an extra argument X-Git-Tag: v1.3.3.1~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd0cb970855da0a4633c154a063c31ba91edecb3;p=thirdparty%2Flibvirt.git 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 Message-id: 1459866012-27081-1-git-send-email-wei.liu2@citrix.com (cherry picked from commit 216650f14b35ad11a45505405347f8027bc294d7) --- diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 04962a01e2..aed904b791 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, ¶ms, 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, ¶ms, NULL,