From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yang Hongyang Subject: [PATCH v2 1/6] tools/libxl: rename libxl__domain_suspend to libxl__domain_save Date: Wed, 3 Jun 2015 16:01:28 +0800 Message-ID: <1433318493-24561-2-git-send-email-yanghy@cn.fujitsu.com> References: <1433318493-24561-1-git-send-email-yanghy@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1433318493-24561-1-git-send-email-yanghy@cn.fujitsu.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@lists.xen.org Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, wency@cn.fujitsu.com, andrew.cooper3@citrix.com, yunhong.jiang@intel.com, eddie.dong@intel.com, guijianfeng@cn.fujitsu.com, rshriram@cs.ubc.ca, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org Rename libxl__domain_suspend() to libxl__domain_save() since it actually do the save domain work. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper --- tools/libxl/libxl.c | 4 ++-- tools/libxl/libxl_dom.c | 16 ++++++++-------- tools/libxl/libxl_internal.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9117b01..5a70062 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -911,7 +911,7 @@ static void libxl__remus_setup_done(libxl__egc *egc, STATE_AO_GC(dss->ao); if (!rc) { - libxl__domain_suspend(egc, dss); + libxl__domain_save(egc, dss); return; } @@ -978,7 +978,7 @@ int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, dss->live = flags & LIBXL_SUSPEND_LIVE; dss->debug = flags & LIBXL_SUSPEND_DEBUG; - libxl__domain_suspend(egc, dss); + libxl__domain_save(egc, dss); return AO_INPROGRESS; out_err: diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a0c9850..cce04dd 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1103,8 +1103,8 @@ int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, /*==================== Domain suspend (save) ====================*/ -static void domain_suspend_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int rc); +static void domain_save_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc); static void domain_suspend_callback_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int ok); @@ -1959,7 +1959,7 @@ static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev, /*----- main code for suspending, in order of execution -----*/ -void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) +void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); int port; @@ -2040,7 +2040,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) return; out: - domain_suspend_done(egc, dss, rc); + domain_save_done(egc, dss, rc); } void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, @@ -2071,14 +2071,14 @@ void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, rc = libxl__domain_suspend_device_model(gc, dss); if (rc) goto out; - libxl__domain_save_device_model(egc, dss, domain_suspend_done); + libxl__domain_save_device_model(egc, dss, domain_save_done); return; } rc = 0; out: - domain_suspend_done(egc, dss, rc); + domain_save_done(egc, dss, rc); } static void save_device_model_datacopier_done(libxl__egc *egc, @@ -2177,8 +2177,8 @@ static void remus_teardown_done(libxl__egc *egc, libxl__remus_devices_state *rds, int rc); -static void domain_suspend_done(libxl__egc *egc, - libxl__domain_suspend_state *dss, int rc) +static void domain_save_done(libxl__egc *egc, + libxl__domain_suspend_state *dss, int rc) { STATE_AO_GC(dss->ao); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index bb3a5c7..e765d68 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3140,8 +3140,8 @@ struct libxl__domain_create_state { /*----- Domain suspend (save) functions -----*/ /* calls dss->callback when done */ -_hidden void libxl__domain_suspend(libxl__egc *egc, - libxl__domain_suspend_state *dss); +_hidden void libxl__domain_save(libxl__egc *egc, + libxl__domain_suspend_state *dss); /* calls libxl__xc_domain_suspend_done when done */ -- 1.9.1