From: Wen Congyang <wency@cn.fujitsu.com> To: xen devel <xen-devel@lists.xen.org>, Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wei.liu2@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com>, Ian Campbell <ian.campbell@citrix.com>, Wen Congyang <wency@cn.fujitsu.com> Subject: [PATCH v4 1/3] libxc: move migration_stream's definition to xenguest.h Date: Tue, 15 Mar 2016 09:58:35 +0800 [thread overview] Message-ID: <1458007117-22697-1-git-send-email-wency@cn.fujitsu.com> (raw) xc_domain_save() and xc_domain_restore's parameter will use this type, so it should be public. Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> Acked-by: Wei Liu <wei.liu2@citrix.com> --- v2->v3: Rename MIG_STREAM_* to XC_MIG_STREAM_* tools/libxc/include/xenguest.h | 7 ++++++- tools/libxc/xc_sr_common.h | 10 ---------- tools/libxc/xc_sr_save.c | 12 ++++++------ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index affc42b..cf521c3 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -75,13 +75,18 @@ struct save_callbacks { void* data; }; +typedef enum { + XC_MIG_STREAM_NONE, /* plain stream */ + XC_MIG_STREAM_REMUS, +} xc_migration_stream_t; + /** * This function will save a running domain. * * @parm xch a handle to an open hypervisor interface * @parm fd the file descriptor to save a domain to * @parm dom the id of the domain - * @param checkpointed_stream MIG_STREAM_NONE if the far end of the stream + * @param checkpointed_stream XC_MIG_STREAM_NONE if the far end of the stream * doesn't use checkpointing * @return 0 on success, -1 on failure */ diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 66f595f..e7568b5 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -180,16 +180,6 @@ struct xc_sr_context xc_dominfo_t dominfo; - /* - * migration stream - * 0: Plain VM - * 1: Remus - */ - enum { - MIG_STREAM_NONE, /* plain stream */ - MIG_STREAM_REMUS, - } migration_stream; - union /* Common save or restore data. */ { struct /* Save data. */ diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index e258b7c..ab59673 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -629,7 +629,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - if ( ctx->save.debug && ctx->save.checkpointed != MIG_STREAM_NONE ) + if ( ctx->save.debug && ctx->save.checkpointed != XC_MIG_STREAM_NONE ) { rc = verify_frames(ctx); if ( rc ) @@ -758,7 +758,7 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) if ( ctx->save.live ) rc = send_domain_memory_live(ctx); - else if ( ctx->save.checkpointed != MIG_STREAM_NONE ) + else if ( ctx->save.checkpointed != XC_MIG_STREAM_NONE ) rc = send_domain_memory_checkpointed(ctx); else rc = send_domain_memory_nonlive(ctx); @@ -778,7 +778,7 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) if ( rc ) goto err; - if ( ctx->save.checkpointed != MIG_STREAM_NONE ) + if ( ctx->save.checkpointed != XC_MIG_STREAM_NONE ) { /* * We have now completed the initial live portion of the checkpoint @@ -799,7 +799,7 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) if ( rc <= 0 ) goto err; } - } while ( ctx->save.checkpointed != MIG_STREAM_NONE ); + } while ( ctx->save.checkpointed != XC_MIG_STREAM_NONE ); xc_report_progress_single(xch, "End of stream"); @@ -845,8 +845,8 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, ctx.save.checkpointed = checkpointed_stream; /* If altering migration_stream update this assert too. */ - assert(checkpointed_stream == MIG_STREAM_NONE || - checkpointed_stream == MIG_STREAM_REMUS); + assert(checkpointed_stream == XC_MIG_STREAM_NONE || + checkpointed_stream == XC_MIG_STREAM_REMUS); /* * TODO: Find some time to better tweak the live migration algorithm. -- 2.5.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
next reply other threads:[~2016-03-15 1:58 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-15 1:58 Wen Congyang [this message] 2016-03-15 1:58 ` [PATCH v4 2/3] tools: change checkpointed_stream's type from int to xc_migration_stream_t Wen Congyang 2016-03-17 13:53 ` Ian Jackson 2016-03-15 1:58 ` [PATCH v4 3/3] libxl: rename checkpointed_stream to stream_type Wen Congyang 2016-03-15 12:54 ` Wei Liu 2016-03-16 1:08 ` Wen Congyang
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=1458007117-22697-1-git-send-email-wency@cn.fujitsu.com \ --to=wency@cn.fujitsu.com \ --cc=andrew.cooper3@citrix.com \ --cc=ian.campbell@citrix.com \ --cc=ian.jackson@eu.citrix.com \ --cc=wei.liu2@citrix.com \ --cc=xen-devel@lists.xen.org \ --subject='Re: [PATCH v4 1/3] libxc: move migration_stream'\''s definition to xenguest.h' \ /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).