Re: [Qemu-devel] [PATCH 12/31] ram: Move norm_pages to RAMState

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  migration/ram.c | 26 ++++++++++++++------------
>  1 file changed, 14 insertions(+), 12 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index 468f042..58c7dc7 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -162,6 +162,8 @@ struct RAMState {
>      /* Accounting fields */
>      /* number of zero pages.  It used to be pages filled by the same char. */
>      uint64_t zero_pages;
> +    /* number of normal transferred pages */
> +    uint64_t norm_pages;
>  };
>  typedef struct RAMState RAMState;
>  
> @@ -169,7 +171,6 @@ static RAMState ram_state;
>  
>  /* accounting for migration statistics */
>  typedef struct AccountingInfo {
> -    uint64_t norm_pages;
>      uint64_t iterations;
>      uint64_t xbzrle_bytes;
>      uint64_t xbzrle_pages;
> @@ -192,12 +193,12 @@ uint64_t dup_mig_pages_transferred(void)
>  
>  uint64_t norm_mig_bytes_transferred(void)
>  {
> -    return acct_info.norm_pages * TARGET_PAGE_SIZE;
> +    return ram_state.norm_pages * TARGET_PAGE_SIZE;
>  }
>  
>  uint64_t norm_mig_pages_transferred(void)
>  {
> -    return acct_info.norm_pages;
> +    return ram_state.norm_pages;
>  }
>  
>  uint64_t xbzrle_mig_bytes_transferred(void)
> @@ -782,7 +783,7 @@ static int ram_save_page(RAMState *rs, MigrationState 
> *ms, QEMUFile *f,
>      if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
>          if (ret != RAM_SAVE_CONTROL_DELAYED) {
>              if (bytes_xmit > 0) {
> -                acct_info.norm_pages++;
> +                rs->norm_pages++;
>              } else if (bytes_xmit == 0) {
>                  rs->zero_pages++;
>              }
> @@ -821,7 +822,7 @@ static int ram_save_page(RAMState *rs, MigrationState 
> *ms, QEMUFile *f,
>          }
>          *bytes_transferred += TARGET_PAGE_SIZE;
>          pages = 1;
> -        acct_info.norm_pages++;
> +        rs->norm_pages++;
>      }
>  
>      XBZRLE_cache_unlock();
> @@ -888,8 +889,8 @@ static inline void set_compress_params(CompressParam 
> *param, RAMBlock *block,
>      param->offset = offset;
>  }
>  
> -static int compress_page_with_multi_thread(QEMUFile *f, RAMBlock *block,
> -                                           ram_addr_t offset,
> +static int compress_page_with_multi_thread(RAMState *rs, QEMUFile *f,
> +                                           RAMBlock *block, ram_addr_t 
> offset,
>                                             uint64_t *bytes_transferred)
>  {
>      int idx, thread_count, bytes_xmit = -1, pages = -1;
> @@ -906,7 +907,7 @@ static int compress_page_with_multi_thread(QEMUFile *f, 
> RAMBlock *block,
>                  qemu_cond_signal(&comp_param[idx].cond);
>                  qemu_mutex_unlock(&comp_param[idx].mutex);
>                  pages = 1;
> -                acct_info.norm_pages++;
> +                rs->norm_pages++;
>                  *bytes_transferred += bytes_xmit;
>                  break;
>              }
> @@ -958,7 +959,7 @@ static int ram_save_compressed_page(RAMState *rs, 
> MigrationState *ms,
>      if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
>          if (ret != RAM_SAVE_CONTROL_DELAYED) {
>              if (bytes_xmit > 0) {
> -                acct_info.norm_pages++;
> +                rs->norm_pages++;
>              } else if (bytes_xmit == 0) {
>                  rs->zero_pages++;
>              }
> @@ -981,7 +982,7 @@ static int ram_save_compressed_page(RAMState *rs, 
> MigrationState *ms,
>                                                   migrate_compress_level());
>                  if (blen > 0) {
>                      *bytes_transferred += bytes_xmit + blen;
> -                    acct_info.norm_pages++;
> +                    rs->norm_pages++;
>                      pages = 1;
>                  } else {
>                      qemu_file_set_error(f, blen);
> @@ -995,7 +996,7 @@ static int ram_save_compressed_page(RAMState *rs, 
> MigrationState *ms,
>              offset |= RAM_SAVE_FLAG_CONTINUE;
>              pages = save_zero_page(rs, f, block, offset, p, 
> bytes_transferred);
>              if (pages == -1) {
> -                pages = compress_page_with_multi_thread(f, block, offset,
> +                pages = compress_page_with_multi_thread(rs, f, block, offset,
>                                                          bytes_transferred);
>              } else {
>                  ram_release_pages(ms, block->idstr, pss->offset, pages);
> @@ -1417,7 +1418,7 @@ void acct_update_position(QEMUFile *f, size_t size, 
> bool zero)
>      if (zero) {
>          ram_state.zero_pages += pages;
>      } else {
> -        acct_info.norm_pages += pages;
> +        ram_state.norm_pages += pages;
>          bytes_transferred += size;
>          qemu_update_position(f, size);
>      }
> @@ -1929,6 +1930,7 @@ static int ram_save_init_globals(RAMState *rs)
>      rs->dirty_rate_high_cnt = 0;
>      rs->bitmap_sync_count = 0;
>      rs->zero_pages = 0;
> +    rs->norm_pages = 0;
>      migration_bitmap_sync_init(rs);
>      qemu_mutex_init(&migration_bitmap_mutex);
>  
> -- 
> 2.9.3
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK