On Wed, 2015-07-15 at 15:45 +0800, Yang Hongyang wrote:
> There are 2 remus checkpoint callbacks(save/restore), currently, they
> both called libxl__remus_domain_checkpoint_callback in diffrent
> file, so it is ok. But in the following patch, we will move all of the
> remus callback code into a seperate file, the name should be diffrent.
"separate" and "different" (twice).
> So rename them to:
> libxl__remus_domain_{save/restore}_checkpoint_callback
>
> Signed-off-by: Yang Hongyang <yan...@cn.fujitsu.com>
Acked-by: Ian Campbell <ian.campb...@citrix.com>
> CC: Ian Jackson <ian.jack...@eu.citrix.com>
> CC: Wei Liu <wei.l...@citrix.com>
> ---
> tools/libxl/libxl_create.c | 4 ++--
> tools/libxl/libxl_dom.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> index 5b4d333..a32e3df 100644
> --- a/tools/libxl/libxl_create.c
> +++ b/tools/libxl/libxl_create.c
> @@ -677,7 +677,7 @@ static int store_libxl_entry(libxl__gc *gc, uint32_t
> domid,
> static void remus_checkpoint_stream_done(
> libxl__egc *egc, libxl__stream_read_state *srs, int rc);
>
> -static void libxl__remus_domain_checkpoint_callback(void *data)
> +static void libxl__remus_domain_restore_checkpoint_callback(void *data)
> {
> libxl__save_helper_state *shs = data;
> libxl__domain_create_state *dcs = shs->caller_state;
> @@ -989,7 +989,7 @@ static void domcreate_bootloader_done(libxl__egc *egc,
> }
>
> /* Restore */
> - callbacks->checkpoint = libxl__remus_domain_checkpoint_callback;
> + callbacks->checkpoint = libxl__remus_domain_restore_checkpoint_callback;
>
> rc = libxl__build_pre(gc, domid, d_config, state);
> if (rc)
> diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
> index 0788309..9c61fa7 100644
> --- a/tools/libxl/libxl_dom.c
> +++ b/tools/libxl/libxl_dom.c
> @@ -1586,7 +1586,7 @@ static void remus_next_checkpoint(libxl__egc *egc,
> libxl__ev_time *ev,
> const struct timeval *requested_abs,
> int rc);
>
> -static void libxl__remus_domain_checkpoint_callback(void *data)
> +static void libxl__remus_domain_save_checkpoint_callback(void *data)
> {
> libxl__save_helper_state *shs = data;
> libxl__domain_suspend_state *dss = shs->caller_state;
> @@ -1749,7 +1749,7 @@ void libxl__domain_save(libxl__egc *egc,
> libxl__domain_suspend_state *dss)
> if (r_info != NULL) {
> callbacks->suspend = libxl__remus_domain_suspend_callback;
> callbacks->postcopy = libxl__remus_domain_resume_callback;
> - callbacks->checkpoint = libxl__remus_domain_checkpoint_callback;
> + callbacks->checkpoint = libxl__remus_domain_save_checkpoint_callback;
> dss->sws.checkpoint_callback = remus_checkpoint_stream_written;
> } else
> callbacks->suspend = libxl__domain_suspend_callback;
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
