From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wen Congyang Subject: [PATCH v10 12/31] tools/libxl: add back channel support to read stream Date: Mon, 22 Feb 2016 10:52:16 +0800 Message-ID: <1456109555-28299-13-git-send-email-wency@cn.fujitsu.com> References: <1456109555-28299-1-git-send-email-wency@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1456109555-28299-1-git-send-email-wency@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 , Konrad Rzeszutek Wilk , Andrew Cooper , Ian Campbell , Ian Jackson , Wei Liu Cc: Lars Kurth , Changlong Xie , Wen Congyang , Gui Jianfeng , Jiang Yunhong , Dong Eddie , Shriram Rajagopalan , Yang Hongyang List-Id: xen-devel@lists.xenproject.org This is used by primay to read records sent by secondary. Signed-off-by: Yang Hongyang Signed-off-by: Wen Congyang --- tools/libxl/libxl_create.c | 1 + tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_stream_read.c | 27 +++++++++++++++++++++++---- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 525bf85..fc746fb 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1030,6 +1030,7 @@ static void domcreate_bootloader_done(libxl__egc *egc, dcs->srs.dcs = dcs; dcs->srs.fd = restore_fd; dcs->srs.legacy = (dcs->restore_params.stream_version == 1); + dcs->srs.back_channel = false; dcs->srs.completion_callback = domcreate_stream_done; if (restore_fd >= 0) { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index cdf6751..32957ca 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3420,6 +3420,7 @@ struct libxl__stream_read_state { libxl__domain_create_state *dcs; int fd; bool legacy; + bool back_channel; void (*completion_callback)(libxl__egc *egc, libxl__stream_read_state *srs, int rc); diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index f4781eb..02a2c46 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -118,6 +118,15 @@ * record, and therefore the buffered state is inconsistent. In * libxl__xc_domain_restore_done(), we just complete the stream and * stream->completion_callback() will be called to resume the guest + * + * For back channel stream: + * - libxl__stream_read_start() + * - Set up the stream to running state + * + * - libxl__stream_read_continue() + * - Set up reading the next record from a started stream. + * Add some codes to process_record() to handle the record. + * Then call stream->checkpoint_callback() to return. */ /* Success/error/cleanup handling. */ @@ -221,6 +230,17 @@ void libxl__stream_read_start(libxl__egc *egc, stream->running = true; stream->phase = SRS_PHASE_NORMAL; + dc->ao = stream->ao; + dc->copywhat = "restore v2 stream"; + dc->writefd = -1; + + if (stream->back_channel) { + assert(!stream->legacy); + + dc->readfd = stream->fd; + return; + } + if (stream->legacy) { /* Convert the legacy stream. */ libxl__conversion_helper_state *chs = &stream->chs; @@ -243,10 +263,7 @@ void libxl__stream_read_start(libxl__egc *egc, } /* stream->fd is now a v2 stream. */ - dc->ao = stream->ao; - dc->copywhat = "restore v2 stream"; dc->readfd = stream->fd; - dc->writefd = -1; /* Start reading the stream header. */ rc = setup_read(stream, "stream header", @@ -762,7 +779,9 @@ static void stream_done(libxl__egc *egc, LIBXL_STAILQ_FOREACH_SAFE(rec, &stream->record_queue, entry, trec) free_record(rec); - check_all_finished(egc, stream, rc); + if (!stream->back_channel) + /* back channel stream doesn't have restore helper */ + check_all_finished(egc, stream, rc); } void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, -- 2.5.0