xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: libvir-list@redhat.com
Cc: cardoe@cardoe.com, Ian Jackson <Ian.Jackson@eu.citrix.com>,
	Wei Liu <wei.liu2@citrix.com>,
	Xen-devel <xen-devel@lists.xenproject.org>
Subject: [PATCH] libxl: libxl_domain_create_restore has an extra argument
Date: Tue, 5 Apr 2016 15:20:12 +0100	[thread overview]
Message-ID: <1459866012-27081-1-git-send-email-wei.liu2@citrix.com> (raw)

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>
---
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,
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

             reply	other threads:[~2016-04-05 14:22 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-05 14:20 Wei Liu [this message]
2016-04-05 14:28 ` Wei Liu
2016-04-05 15:12   ` Ian Jackson
     [not found]   ` <22275.54777.889693.883970@mariner.uk.xensource.com>
2016-04-06 11:24     ` Wei Liu
2016-04-06 21:43 ` Doug Goldstein
     [not found] ` <570582EB.4050305@cardoe.com>
2016-04-07 16:35   ` [libvirt] " Daniel P. Berrange
2016-04-07 17:44     ` Wei Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459866012-27081-1-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=Ian.Jackson@eu.citrix.com \
    --cc=cardoe@cardoe.com \
    --cc=libvir-list@redhat.com \
    --cc=xen-devel@lists.xenproject.org \
    --subject='Re: [PATCH] libxl: libxl_domain_create_restore has an extra argument' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).