From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yang Hongyang Subject: [PATCH v7 COLO 02/18] tools/libxl: handle colo_context records in a libxl migration v2 stream Date: Thu, 25 Jun 2015 14:30:56 +0800 Message-ID: <1435213872-10698-3-git-send-email-yanghy@cn.fujitsu.com> References: <1435213872-10698-1-git-send-email-yanghy@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1435213872-10698-1-git-send-email-yanghy@cn.fujitsu.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@lists.xen.org Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, wency@cn.fujitsu.com, andrew.cooper3@citrix.com, yunhong.jiang@intel.com, eddie.dong@intel.com, guijianfeng@cn.fujitsu.com, rshriram@cs.ubc.ca, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org From: Wen Congyang Signed-off-by: Wen Congyang --- tools/libxl/libxl_internal.h | 3 +++ tools/libxl/libxl_stream_read.c | 51 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 840734d..7f591ee 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3249,6 +3249,7 @@ struct libxl__stream_read_state { int joined_rc; bool running; bool in_checkpoint; + bool in_colo_context; libxl__datacopier_state dc; size_t expected_len; libxl_sr_hdr hdr; @@ -3263,6 +3264,8 @@ _hidden void libxl__stream_read_continue(libxl__egc *egc, libxl__stream_read_state *stream); _hidden void libxl__stream_read_start_checkpoint( libxl__egc *egc, libxl__stream_read_state *stream); +_hidden void libxl__stream_read_colo_context( + libxl__egc *egc, libxl__stream_read_state *stream); _hidden void libxl__stream_read_abort(libxl__egc *egc, libxl__stream_read_state *stream, int rc); diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index 72a9972..d1c2d20 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -93,6 +93,13 @@ static void emulator_padding_done(libxl__egc *egc, static void checkpoint_done(libxl__egc *egc, libxl__stream_read_state *stream, int rc); +static void handle_colo_context(libxl__egc *egc, + libxl__stream_read_state *stream); + +/* Error handling for colo context mini-loop */ +static void colo_context_done(libxl__egc *egc, + libxl__stream_read_state *stream, int rc); + void libxl__stream_read_start(libxl__egc *egc, libxl__stream_read_state *stream) { @@ -190,6 +197,7 @@ void libxl__stream_read_start_checkpoint(libxl__egc *egc, assert(stream->running); assert(!stream->in_checkpoint); assert(!stream->back_channel); + assert(!stream->in_colo_context); stream->in_checkpoint = true; /* Read a record header. */ @@ -211,6 +219,17 @@ void libxl__stream_read_start_checkpoint(libxl__egc *egc, stream_failed(egc, stream, ret); } +void libxl__stream_read_colo_context(libxl__egc *egc, + libxl__stream_read_state *stream) +{ + assert(stream->running); + assert(!stream->in_checkpoint); + assert(!stream->in_colo_context); + stream->in_colo_context = true; + + libxl__stream_read_continue(egc, stream); +} + void libxl__stream_read_abort(libxl__egc *egc, libxl__stream_read_state *stream, int rc) { @@ -240,6 +259,12 @@ static void stream_failed(libxl__egc *egc, return; } + if (stream->in_colo_context) { + assert(rc < 0); + colo_context_done(egc, stream, rc); + return; + } + if (stream->back_channel) { stream->completion_callback(egc, stream, rc); return; @@ -259,6 +284,7 @@ static void stream_done(libxl__egc *egc, assert(!stream->running); assert(!stream->in_checkpoint); assert(!stream->back_channel); + assert(!stream->in_colo_context); if (stream->v2_carefd) libxl__carefd_close(stream->v2_carefd); @@ -531,6 +557,15 @@ static void process_record(libxl__egc *egc, checkpoint_done(egc, stream, 0); break; + case REC_TYPE_COLO_CONTEXT: + if (!stream->in_colo_context) { + LOG(ERROR, "Unexpected COLO_CONTEXT record in stream"); + ret = ERROR_FAIL; + goto err; + } + handle_colo_context(egc, stream); + break; + default: LOG(ERROR, "Unrecognised record 0x%08x", rec_hdr->type); ret = ERROR_FAIL; @@ -671,6 +706,14 @@ static void emulator_padding_done(libxl__egc *egc, stream_failed(egc, stream, ret); } +static void handle_colo_context(libxl__egc *egc, + libxl__stream_read_state *stream) +{ + libxl_sr_colo_context *colo_context = stream->rec_body; + + colo_context_done(egc, stream, colo_context->id); +} + static void checkpoint_done(libxl__egc *egc, libxl__stream_read_state *stream, int rc) { @@ -679,6 +722,14 @@ static void checkpoint_done(libxl__egc *egc, stream->read_records_callback(egc, stream, rc); } +static void colo_context_done(libxl__egc *egc, + libxl__stream_read_state *stream, int rc) +{ + assert(stream->in_colo_context); + stream->in_colo_context = false; + stream->read_records_callback(egc, stream, rc); +} + /* * Local variables: * mode: C -- 1.9.1