xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wen Congyang <wency@cn.fujitsu.com>
To: xen devel <xen-devel@lists.xen.org>,
	Andrew Cooper <andrew.cooper3@citrix.com>,
	Ian Campbell <ian.campbell@citrix.com>,
	Ian Jackson <ian.jackson@eu.citrix.com>,
	Wei Liu <wei.liu2@citrix.com>
Cc: Lars Kurth <lars.kurth@citrix.com>,
	Changlong Xie <xiecl.fnst@cn.fujitsu.com>,
	Wen Congyang <wency@cn.fujitsu.com>,
	Gui Jianfeng <guijianfeng@cn.fujitsu.com>,
	Jiang Yunhong <yunhong.jiang@intel.com>,
	Dong Eddie <eddie.dong@intel.com>,
	Shriram Rajagopalan <rshriram@cs.ubc.ca>,
	Yang Hongyang <hongyang.yang@easystack.cn>
Subject: [PATCH v9 05/25] tools/libxl: add back channel support to write stream
Date: Wed, 30 Dec 2015 10:37:35 +0800	[thread overview]
Message-ID: <1451443075-27428-6-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1451443075-27428-1-git-send-email-wency@cn.fujitsu.com>

Add back channel support to write stream. If the write stream is
a back channel stream, this means the write stream is used by
Secondary to send some records back.

Signed-off-by: Yang Hongyang <hongyang.yang@easystack.cn>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
 tools/libxl/libxl_dom_save.c     |  1 +
 tools/libxl/libxl_internal.h     |  1 +
 tools/libxl/libxl_stream_write.c | 26 ++++++++++++++++++++------
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/tools/libxl/libxl_dom_save.c b/tools/libxl/libxl_dom_save.c
index 86026ac..5fd9db2 100644
--- a/tools/libxl/libxl_dom_save.c
+++ b/tools/libxl/libxl_dom_save.c
@@ -409,6 +409,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_save_state *dss)
     dss->sws.ao  = dss->ao;
     dss->sws.dss = dss;
     dss->sws.fd  = dss->fd;
+    dss->sws.back_channel = false;
     dss->sws.completion_callback = stream_done;
 
     libxl__stream_write_start(egc, &dss->sws);
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index b6929a9..b473748 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -3040,6 +3040,7 @@ struct libxl__stream_write_state {
     libxl__ao *ao;
     libxl__domain_save_state *dss;
     int fd;
+    bool back_channel;
     void (*completion_callback)(libxl__egc *egc,
                                 libxl__stream_write_state *sws,
                                 int rc);
diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c
index 852546f..538a1c6 100644
--- a/tools/libxl/libxl_stream_write.c
+++ b/tools/libxl/libxl_stream_write.c
@@ -49,6 +49,13 @@
  *  - if (hvm)
  *      - Emulator context record
  *  - Checkpoint end record
+ *
+ * For back channel stream:
+ * - libxl__stream_write_start()
+ *    - Set up the stream to running state
+ *
+ * - Add a new API to write the record. When the record is written
+ *   out, call stream->checkpoint_callback() to return.
  */
 
 /* Success/error/cleanup handling. */
@@ -225,6 +232,15 @@ void libxl__stream_write_start(libxl__egc *egc,
 
     stream->running = true;
 
+    dc->ao        = ao;
+    dc->readfd    = -1;
+    dc->copywhat  = "save v2 stream";
+    dc->writefd   = stream->fd;
+    dc->maxsz     = -1;
+
+    if (stream->back_channel)
+        return;
+
     if (dss->type == LIBXL_DOMAIN_TYPE_HVM) {
         stream->device_model_version =
             libxl__device_model_version_running(gc, dss->domid);
@@ -249,12 +265,7 @@ void libxl__stream_write_start(libxl__egc *egc,
         stream->emu_sub_hdr.index = 0;
     }
 
-    dc->ao        = ao;
-    dc->readfd    = -1;
     dc->writewhat = "stream header";
-    dc->copywhat  = "save v2 stream";
-    dc->writefd   = stream->fd;
-    dc->maxsz     = -1;
     dc->callback  = stream_header_done;
 
     rc = libxl__datacopier_start(dc);
@@ -279,6 +290,7 @@ void libxl__stream_write_start_checkpoint(libxl__egc *egc,
 {
     assert(stream->running);
     assert(!stream->in_checkpoint);
+    assert(!stream->back_channel);
     stream->in_checkpoint = true;
 
     write_emulator_xenstore_record(egc, stream);
@@ -584,7 +596,9 @@ static void stream_done(libxl__egc *egc,
         libxl__carefd_close(stream->emu_carefd);
     free(stream->emu_body);
 
-    check_all_finished(egc, stream, rc);
+    if (!stream->back_channel)
+        /* back channel stream doesn't have save helper */
+        check_all_finished(egc, stream, rc);
 }
 
 static void checkpoint_done(libxl__egc *egc,
-- 
2.5.0

  parent reply	other threads:[~2015-12-30  2:37 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-30  2:37 [PATCH v9 00/25] COarse-grain LOck-stepping Virtual Machines for Non-stop Service Wen Congyang
2015-12-30  2:37 ` [PATCH v9 01/25] docs: add colo readme Wen Congyang
2015-12-30  2:37 ` [PATCH v9 02/25] docs/libxl: Introduce COLO_CONTEXT to support migration v2 colo streams Wen Congyang
2016-01-26 20:40   ` Konrad Rzeszutek Wilk
2016-01-27  6:47     ` Wen Congyang
2016-01-27 11:00       ` Andrew Cooper
2016-01-27 15:11         ` Konrad Rzeszutek Wilk
2016-01-27 15:15           ` Andrew Cooper
2016-01-27 15:28             ` Konrad Rzeszutek Wilk
2016-01-27 15:30               ` Andrew Cooper
2016-01-27 16:01                 ` Ian Jackson
2015-12-30  2:37 ` [PATCH v9 03/25] libxc/migration: Specification update for DIRTY_PFN_LIST records Wen Congyang
2016-01-26 20:44   ` Konrad Rzeszutek Wilk
2016-01-27  6:47     ` Wen Congyang
2016-01-27  7:12     ` Wen Congyang
2016-01-27 10:00       ` Ian Campbell
2016-01-27 11:01         ` Andrew Cooper
2015-12-30  2:37 ` [PATCH v9 04/25] libxc/migration: export read_record for common use Wen Congyang
2016-01-26 20:45   ` Konrad Rzeszutek Wilk
2016-01-27  0:57     ` Wen Congyang
2015-12-30  2:37 ` Wen Congyang [this message]
2015-12-30  2:37 ` [PATCH v9 06/25] tools/libxl: write checkpoint_state records into the stream Wen Congyang
2015-12-30  2:37 ` [PATCH v9 07/25] tools/libxl: add back channel support to read stream Wen Congyang
2015-12-30  2:37 ` [PATCH v9 08/25] tools/libxl: handle checkpoint_state records in a libxl migration v2 " Wen Congyang
2015-12-30  2:37 ` [PATCH v9 09/25] tools/libx{l, c}: introduce should_checkpoint callback Wen Congyang
2016-01-26 20:50   ` Konrad Rzeszutek Wilk
2016-01-26 21:09     ` Konrad Rzeszutek Wilk
2016-01-27  1:03       ` Wen Congyang
2016-01-27  1:18     ` Wen Congyang
2015-12-30  2:37 ` [PATCH v9 10/25] tools/libx{l, c}: add postcopy/suspend callback to restore side Wen Congyang
2015-12-30  2:37 ` [PATCH v9 11/25] secondary vm suspend/resume/checkpoint code Wen Congyang
2015-12-30  2:37 ` [PATCH v9 12/25] primary " Wen Congyang
2015-12-30  2:37 ` [PATCH v9 13/25] libxc/restore: support COLO restore Wen Congyang
2015-12-30  2:37 ` [PATCH v9 14/25] libxc/restore: send dirty pfn list to primary when checkpoint under colo Wen Congyang
2015-12-30  2:37 ` [PATCH v9 15/25] send store gfn and console gfn to xl before resuming secondary vm Wen Congyang
2015-12-30  2:37 ` [PATCH v9 16/25] libxc/save: support COLO save Wen Congyang
2015-12-30  2:37 ` [PATCH v9 17/25] implement the cmdline for COLO Wen Congyang
2015-12-30  2:37 ` [PATCH v9 18/25] Support colo mode for qemu disk Wen Congyang
2015-12-30  2:37 ` [PATCH v9 19/25] COLO: use qemu block replication Wen Congyang
2015-12-30  2:37 ` [PATCH v9 20/25] COLO proxy: implement setup/teardown of COLO proxy module Wen Congyang
2015-12-30  2:37 ` [PATCH v9 21/25] COLO proxy: preresume, postresume and checkpoint Wen Congyang
2015-12-30  2:37 ` [PATCH v9 22/25] COLO nic: implement COLO nic subkind Wen Congyang
2015-12-30  2:37 ` [PATCH v9 23/25] setup and control colo proxy on primary side Wen Congyang
2015-12-30  2:37 ` [PATCH v9 24/25] setup and control colo proxy on secondary side Wen Congyang
2015-12-30  2:37 ` [PATCH v9 25/25] cmdline switches and config vars to control colo-proxy 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=1451443075-27428-6-git-send-email-wency@cn.fujitsu.com \
    --to=wency@cn.fujitsu.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=eddie.dong@intel.com \
    --cc=guijianfeng@cn.fujitsu.com \
    --cc=hongyang.yang@easystack.cn \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=lars.kurth@citrix.com \
    --cc=rshriram@cs.ubc.ca \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xen.org \
    --cc=xiecl.fnst@cn.fujitsu.com \
    --cc=yunhong.jiang@intel.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).