[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [PATCH v4 --for 4.6 COLOPre 07/25] libxl/remus: init checkpoint_callback in Remus checkpoint callback





On 07/15/2015 08:02 PM, Ian Campbell wrote:
On Wed, 2015-07-15 at 15:45 +0800, Yang Hongyang wrote:
init stream {read/write} state checkpoint_callback in Remus
checkpoint callback.

Why? Is this earlier or later than previously? Seems later?

There's no functional change, it's just refactoring so that we can move
all remus code into one file.



Signed-off-by: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
CC: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
CC: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CC: Wei Liu <wei.liu2@xxxxxxxxxx>
---
  tools/libxl/libxl_create.c | 2 +-
  tools/libxl/libxl_dom.c    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index a32e3df..94fe98f 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -684,6 +684,7 @@ static void 
libxl__remus_domain_restore_checkpoint_callback(void *data)
      libxl__egc *egc = shs->egc;
      STATE_AO_GC(dcs->ao);

+    dcs->srs.checkpoint_callback = remus_checkpoint_stream_done;
      libxl__stream_read_start_checkpoint(egc, &dcs->srs);
  }

@@ -1000,7 +1001,6 @@ static void domcreate_bootloader_done(libxl__egc *egc,
      dcs->srs.fd = restore_fd;
      dcs->srs.legacy = (dcs->restore_params.stream_version == 1);
      dcs->srs.completion_callback = domcreate_stream_done;
-    dcs->srs.checkpoint_callback = remus_checkpoint_stream_done;

      libxl__stream_read_start(egc, &dcs->srs);
      return;
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 77a917c..1740bed 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -1593,6 +1593,7 @@ static void 
libxl__remus_domain_save_checkpoint_callback(void *data)
      libxl__egc *egc = shs->egc;
      STATE_AO_GC(dss->ao);

+    dss->sws.checkpoint_callback = remus_checkpoint_stream_written;
      libxl__stream_write_start_checkpoint(egc, &dss->sws);
  }

@@ -1750,7 +1751,6 @@ void libxl__domain_save(libxl__egc *egc, 
libxl__domain_suspend_state *dss)
          callbacks->suspend = libxl__remus_domain_suspend_callback;
          callbacks->postcopy = libxl__remus_domain_resume_callback;
          callbacks->checkpoint = libxl__remus_domain_save_checkpoint_callback;
-        dss->sws.checkpoint_callback = remus_checkpoint_stream_written;
      } else
          callbacks->suspend = libxl__domain_suspend_callback;



.


--
Thanks,
Yang.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.