Re: [Xen-devel] [PATCH v3 26/28] tools/libxl: Handle checkpoint records in a libxl migration v2 stream

[Yang Hongyang <yanghy@xxxxxxxxxxxxxx>]

On 07/13/2015 08:01 PM, Andrew Cooper wrote:
[...]
>           domcreate_rebuild_done(egc, dcs, rc);
> @@ -966,6 +989,7 @@ static void domcreate_bootloader_done(libxl__egc *egc,
>       }
>
>       /* Restore */
> +    callbacks->checkpoint = libxl__remus_domain_checkpoint_callback;
This should be moved after read_stream_init()

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index e42de47..86f7f13 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -989,8 +989,6 @@ static void domcreate_bootloader_done(libxl__egc *egc,
     }

     /* Restore */
-    callbacks->checkpoint = libxl__remus_domain_checkpoint_callback;
-
     rc = libxl__build_pre(gc, domid, d_config, state);
     if (rc)
         goto out;
@@ -1003,6 +1001,7 @@ static void domcreate_bootloader_done(libxl__egc *egc,
     dcs->srs.legacy = (dcs->restore_params.stream_version == 1);
     dcs->srs.completion_callback = domcreate_stream_done;
     dcs->srs.checkpoint_callback = remus_checkpoint_stream_done;
+    callbacks->checkpoint = libxl__remus_domain_checkpoint_callback;

     libxl__stream_read_start(egc, &dcs->srs);
     return;

>       rc = libxl__build_pre(gc, domid, d_config, state);
>       if (rc)
> @@ -978,6 +1002,7 @@ 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;
...

--
Thanks,
Yang.

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