From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH for 4.6 v3 2/5] libxc: migration v2 prefix Memory -> Frames Date: Sun, 6 Sep 2015 21:05:36 +0100 Message-ID: <1441569939-23562-3-git-send-email-wei.liu2@citrix.com> References: <1441569939-23562-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZYgC9-0005CL-CY for xen-devel@lists.xenproject.org; Sun, 06 Sep 2015 20:05:45 +0000 In-Reply-To: <1441569939-23562-1-git-send-email-wei.liu2@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 , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org The prefix "Memory" is confusing because the numbers shown after that are referring to frames. Change a bunch of prefixes from "Memory" to "Frames". Also rename send_memory_verify to verify_frames. Signed-off-by: Wei Liu --- v3: 1. Change all relevant instances of "Memory". 2. Rename function. --- tools/libxc/xc_sr_save.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 58667af..7dc3a48 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -451,7 +451,7 @@ static int update_progress_string(struct xc_sr_context *ctx, xc_interface *xch = ctx->xch; char *new_str = NULL; - if ( asprintf(&new_str, "Memory iteration %u of %u", + if ( asprintf(&new_str, "Frames iteration %u of %u", iter, ctx->save.max_iterations) == -1 ) { PERROR("Unable to allocate new progress string"); @@ -569,7 +569,7 @@ static int suspend_and_send_dirty(struct xc_sr_context *ctx) return rc; } -static int send_memory_verify(struct xc_sr_context *ctx) +static int verify_frames(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; @@ -586,7 +586,7 @@ static int send_memory_verify(struct xc_sr_context *ctx) if ( rc ) goto out; - xc_set_progress_prefix(xch, "Memory verify"); + xc_set_progress_prefix(xch, "Frames verify"); rc = send_all_pages(ctx); if ( rc ) goto out; @@ -629,7 +629,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( ctx->save.debug && !ctx->save.checkpointed ) { - rc = send_memory_verify(ctx); + rc = verify_frames(ctx); if ( rc ) goto out; } @@ -659,7 +659,7 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) if ( rc ) goto err; - xc_set_progress_prefix(xch, "Memory"); + xc_set_progress_prefix(xch, "Frames"); rc = send_all_pages(ctx); if ( rc ) -- 2.1.4