From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 21/27] tools/libxc+libxl+xl: Save v2 streams Date: Mon, 15 Jun 2015 14:44:34 +0100 Message-ID: <1434375880-30914-22-git-send-email-andrew.cooper3@citrix.com> References: <1434375880-30914-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1434375880-30914-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , Yang Hongyang , Ian Jackson , Ian Campbell , Andrew Cooper List-Id: xen-devel@lists.xenproject.org This is a complicated set of changes which must be done together for bisectability. * libxl-save-helper is updated to unconditionally use libxc migration v2. * libxl compatibility workarounds in libxc are disabled for save operations. * libxl__stream_write_start() is logically spliced into the event location where libxl__xc_domain_save() used to reside. * xl is updated to indicate that the stream is now v2 Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu --- RFC: What kind of ABI/API indication is appropriate here. A LIBXL_HAVE* isn't apppropriate. --- tools/libxc/Makefile | 2 -- tools/libxl/libxl_dom.c | 44 ++++++++------------------------------ tools/libxl/libxl_save_helper.c | 2 +- tools/libxl/libxl_stream_write.c | 3 +-- tools/libxl/xl_cmdimpl.c | 1 + 5 files changed, 12 insertions(+), 40 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 0e65b88..99fcf9f 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -64,8 +64,6 @@ GUEST_SRCS-$(CONFIG_X86) += xc_sr_save_x86_hvm.c GUEST_SRCS-y += xc_sr_restore.c GUEST_SRCS-y += xc_sr_save.c GUEST_SRCS-y += xc_offline_page.c xc_compression.c -xc_sr_save_x86_hvm.o: CFLAGS += -DXG_LIBXL_HVM_COMPAT -xc_sr_save_x86_hvm.opic: CFLAGS += -DXG_LIBXL_HVM_COMPAT else GUEST_SRCS-y += xc_nomigrate.c endif diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 867172a..06bfaab 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1107,6 +1107,8 @@ int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, /*==================== Domain suspend (save) ====================*/ +static void stream_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc); static void domain_suspend_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc); static void domain_suspend_callback_common_done(libxl__egc *egc, @@ -2040,48 +2042,20 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty; dss->shs.callbacks.save.toolstack_save = libxl__toolstack_save; - libxl__xc_domain_save(egc, dss); + dss->sws.fd = dss->fd; + dss->sws.ao = dss->ao; + dss->sws.completion_callback = stream_done; + + libxl__stream_write_start(egc, &dss->sws); return; out: domain_suspend_done(egc, dss, rc); } -void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, - int rc, int retval, int errnoval) +static void stream_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc) { - libxl__domain_suspend_state *dss = dss_void; - STATE_AO_GC(dss->ao); - - /* Convenience aliases */ - const libxl_domain_type type = dss->type; - - if (rc) - goto out; - - if (retval) { - LOGEV(ERROR, errnoval, "saving domain: %s", - dss->guest_responded ? - "domain responded to suspend request" : - "domain did not respond to suspend request"); - if ( !dss->guest_responded ) - rc = ERROR_GUEST_TIMEDOUT; - else - rc = ERROR_FAIL; - goto out; - } - - if (type == LIBXL_DOMAIN_TYPE_HVM) { - rc = libxl__domain_suspend_device_model(gc, dss); - if (rc) goto out; - - libxl__domain_save_device_model(egc, dss, domain_suspend_done); - return; - } - - rc = 0; - -out: domain_suspend_done(egc, dss, rc); } diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 851ba92..4cc93a2 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -284,7 +284,7 @@ int main(int argc, char **argv) startup("save"); setup_signals(save_signal_handler); - r = xc_domain_save(xch, io_fd, dom, max_iters, max_factor, flags, + r = xc_domain_save2(xch, io_fd, dom, max_iters, max_factor, flags, &helper_save_callbacks, hvm); complete(r); diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 856d72e..d28a8a5 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -247,8 +247,7 @@ static void libxc_header_done(libxl__egc *egc, stream_failed(egc, stream, ret); } -static void __attribute__((used)) -will_be_libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, +void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, int rc, int retval, int errnoval) { libxl__domain_suspend_state *dss = dss_void; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 14d96c9..35bc26d 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3889,6 +3889,7 @@ static void save_domain_core_writeconfig(int fd, const char *source, memset(&hdr, 0, sizeof(hdr)); memcpy(hdr.magic, savefileheader_magic, sizeof(hdr.magic)); hdr.byteorder = SAVEFILE_BYTEORDER_VALUE; + hdr.mandatory_flags = XL_MANDATORY_FLAG_STREAMv2; optdata_begin= 0; -- 1.7.10.4