[PATCH] libxc: delete sent_last_iter

[PATCH] libxc: delete sent_last_iter

[Wei Liu]

It's set in code but never used.  Detected by -Wunused-but-set-variable.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxc/xc_domain_save.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c
index 301e770..3222473 100644
--- a/tools/libxc/xc_domain_save.c
+++ b/tools/libxc/xc_domain_save.c
@@ -811,7 +811,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
     int live  = (flags & XCFLAGS_LIVE);
     int debug = (flags & XCFLAGS_DEBUG);
     int superpages = !!hvm;
-    int race = 0, sent_last_iter, skip_this_iter = 0;
+    int race = 0, skip_this_iter = 0;
     unsigned int sent_this_iter = 0;
     int tmem_saved = 0;
 
@@ -1014,9 +1014,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
 
     last_iter = !live;
 
-    /* pretend we sent all the pages last iteration */
-    sent_last_iter = dinfo->p2m_size;
-
     /* Setup to_send / to_fix and to_skip bitmaps */
     to_send = xc_hypercall_buffer_alloc_pages(xch, to_send, NRPAGES(bitmap_size(dinfo->p2m_size)));
     to_skip = xc_hypercall_buffer_alloc_pages(xch, to_skip, NRPAGES(bitmap_size(dinfo->p2m_size)));
@@ -1586,8 +1583,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
                 goto out;
             }
 
-            sent_last_iter = sent_this_iter;
-
             print_stats(xch, dom, sent_this_iter, &time_stats, &shadow_stats, 1);
 
         }
-- 
1.9.1

Re: [PATCH] libxc: delete sent_last_iter

[Andrew Cooper]

On 18/06/15 17:37, Wei Liu wrote:
> It's set in code but never used.  Detected by -Wunused-but-set-variable.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

Having said this, I am about to archive this entire file in /dev/null
when I respin the libxl migration v2 series.

~Andrew

Re: [PATCH] libxc: delete sent_last_iter

[Ian Jackson]

Wei Liu writes ("[PATCH] libxc: delete sent_last_iter"):
> It's set in code but never used.  Detected by -Wunused-but-set-variable.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Re: [PATCH] libxc: delete sent_last_iter

[Ian Campbell]

On Thu, 2015-06-18 at 17:37 +0100, Wei Liu wrote:
> It's set in code but never used.  Detected by -Wunused-but-set-variable.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Applied thanks (I figured there was no harm even if it is just about to
be deleted)

> ---
>  tools/libxc/xc_domain_save.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c
> index 301e770..3222473 100644
> --- a/tools/libxc/xc_domain_save.c
> +++ b/tools/libxc/xc_domain_save.c
> @@ -811,7 +811,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
>      int live  = (flags & XCFLAGS_LIVE);
>      int debug = (flags & XCFLAGS_DEBUG);
>      int superpages = !!hvm;
> -    int race = 0, sent_last_iter, skip_this_iter = 0;
> +    int race = 0, skip_this_iter = 0;
>      unsigned int sent_this_iter = 0;
>      int tmem_saved = 0;
>  
> @@ -1014,9 +1014,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
>  
>      last_iter = !live;
>  
> -    /* pretend we sent all the pages last iteration */
> -    sent_last_iter = dinfo->p2m_size;
> -
>      /* Setup to_send / to_fix and to_skip bitmaps */
>      to_send = xc_hypercall_buffer_alloc_pages(xch, to_send, NRPAGES(bitmap_size(dinfo->p2m_size)));
>      to_skip = xc_hypercall_buffer_alloc_pages(xch, to_skip, NRPAGES(bitmap_size(dinfo->p2m_size)));
> @@ -1586,8 +1583,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
>                  goto out;
>              }
>  
> -            sent_last_iter = sent_this_iter;
> -
>              print_stats(xch, dom, sent_this_iter, &time_stats, &shadow_stats, 1);
>  
>          }