From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 28/29] tools/xl: Restore v2 streams using new interface Date: Wed, 10 Sep 2014 18:11:06 +0100 Message-ID: <1410369067-1330-29-git-send-email-andrew.cooper3@citrix.com> References: <1410369067-1330-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1410369067-1330-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Andrew Cooper --- tools/libxl/xl_cmdimpl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 26492fc..d17e333 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -136,6 +136,8 @@ static const char *action_on_shutdown_names[] = { #define SAVEFILE_BYTEORDER_VALUE ((uint32_t)0x01020304UL) +#define SAVEFILE_MANDATORY_STREAMV2 (1 << 0) + struct domain_create { int debug; int daemonize; @@ -2115,7 +2117,7 @@ static uint32_t create_domain(struct domain_create *dom_info) restore_source, hdr.mandatory_flags, hdr.optional_flags, hdr.optional_data_len); - badflags = hdr.mandatory_flags & ~( 0 /* none understood yet */ ); + badflags = hdr.mandatory_flags & ~SAVEFILE_MANDATORY_STREAMV2; if (badflags) { fprintf(stderr, "Savefile has mandatory flag(s) 0x%"PRIx32" " "which are not supported; need newer xl\n", @@ -2250,6 +2252,9 @@ start: libxl_domain_restore_params_init(¶ms); params.checkpointed_stream = dom_info->checkpointed_stream; + params.stream_version = + (hdr.mandatory_flags & SAVEFILE_MANDATORY_STREAMV2) ? 2 : 1; + ret = libxl_domain_create_restore(ctx, &d_config, &domid, restore_fd, ¶ms, -- 1.7.10.4