[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v7 01/18] libxl/remus: init checkpoint_callback in Remus setup callback
On 02/04/2016 03:39 AM, Wei Liu wrote: > On Fri, Jan 29, 2016 at 01:27:17PM +0800, Wen Congyang wrote: >> init stream {read/write} state checkpoint_callback in Remus setup callback. >> 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 <hongyang.yang@xxxxxxxxxxxx> >> Signed-off-by: Wen Congyang <wency@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> >> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> >> --- >> tools/libxl/libxl.c | 2 ++ >> tools/libxl/libxl_create.c | 10 +++++++++- >> tools/libxl/libxl_dom.c | 5 +---- >> tools/libxl/libxl_internal.h | 4 ++++ >> 4 files changed, 16 insertions(+), 5 deletions(-) >> >> diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c >> index 94b5656..5346a0c 100644 >> --- a/tools/libxl/libxl.c >> +++ b/tools/libxl/libxl.c >> @@ -917,6 +917,8 @@ static void libxl__remus_setup(libxl__egc *egc, >> rds->domid = dss->domid; >> rds->callback = remus_setup_done; >> >> + dss->sws.checkpoint_callback = remus_checkpoint_stream_written; >> + >> libxl__remus_devices_setup(egc, rds); >> return; >> >> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c >> index e491d83..8b1efe5 100644 >> --- a/tools/libxl/libxl_create.c >> +++ b/tools/libxl/libxl_create.c >> @@ -718,6 +718,12 @@ static void remus_checkpoint_stream_done( >> libxl__xc_domain_saverestore_async_callback_done(egc, &stream->shs, rc); >> } >> >> +static void libxl__remus_restore_setup(libxl__egc *egc, >> + libxl__domain_create_state *dcs) >> +{ >> + dcs->srs.checkpoint_callback = remus_checkpoint_stream_done; >> +} >> + >> /*----- main domain creation -----*/ >> >> /* We have a linear control flow; only one event callback is >> @@ -1004,6 +1010,7 @@ static void domcreate_bootloader_done(libxl__egc *egc, >> libxl__domain_build_state *const state = &dcs->build_state; >> libxl__srm_restore_autogen_callbacks *const callbacks = >> &dcs->srs.shs.callbacks.restore.a; >> + const int checkpointed_stream = dcs->restore_params.checkpointed_stream; >> >> if (rc) { >> domcreate_rebuild_done(egc, dcs, rc); >> @@ -1042,9 +1049,10 @@ static void domcreate_bootloader_done(libxl__egc *egc, > > A few lines above in this function, there is a line like: > > /* Restore */ > callbacks->checkpoint = libxl__remus_domain_restore_checkpoint_callback; > > Do you not need to move this into libxl__remus_restore_setup as well? As > far as I can tell that's only useful for remus. > >> 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; >> >> if (restore_fd >= 0) { >> + if (checkpointed_stream) >> + libxl__remus_restore_setup(egc, dcs); >> libxl__stream_read_start(egc, &dcs->srs); >> return; >> } >> diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c >> index 2269998..9e28bc4 100644 >> --- a/tools/libxl/libxl_dom.c >> +++ b/tools/libxl/libxl_dom.c >> @@ -1569,8 +1569,6 @@ out: >> >> /*----- remus asynchronous checkpoint callback -----*/ >> >> -static void remus_checkpoint_stream_written( >> - libxl__egc *egc, libxl__stream_write_state *sws, int rc); >> static void remus_devices_commit_cb(libxl__egc *egc, >> libxl__remus_devices_state *rds, >> int rc); >> @@ -1588,7 +1586,7 @@ static void >> libxl__remus_domain_save_checkpoint_callback(void *data) >> libxl__stream_write_start_checkpoint(egc, &dss->sws); >> } >> >> -static void remus_checkpoint_stream_written( >> +void remus_checkpoint_stream_written( >> libxl__egc *egc, libxl__stream_write_state *sws, int rc) >> { >> libxl__domain_suspend_state *dss = CONTAINER_OF(sws, *dss, sws); >> @@ -1761,7 +1759,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; > > Do you not want to move this to libxl__remus_setup? I think so, and will fix these two in the next version. Thanks Wen Congyang > > > Wei. > > > . > _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |