* Juan Quintela (quint...@redhat.com) wrote:
> Once there, remove the now unused AccountingInfo struct and var.
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
> ---
> migration/ram.c | 21 +++++----------------
> 1 file changed, 5 insertions(+), 16 deletions(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index c398ff9..3292eb0 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -180,23 +180,13 @@ struct RAMState {
> uint64_t xbzrle_cache_miss;
> /* xbzrle miss rate */
> double xbzrle_cache_miss_rate;
> + /* xbzrle number of overflows */
> + uint64_t xbzrle_overflows;
> };
> typedef struct RAMState RAMState;
>
> static RAMState ram_state;
>
> -/* accounting for migration statistics */
> -typedef struct AccountingInfo {
> - uint64_t xbzrle_overflows;
> -} AccountingInfo;
> -
> -static AccountingInfo acct_info;
> -
> -static void acct_clear(void)
> -{
> - memset(&acct_info, 0, sizeof(acct_info));
> -}
> -
> uint64_t dup_mig_pages_transferred(void)
> {
> return ram_state.zero_pages;
> @@ -229,7 +219,7 @@ double xbzrle_mig_cache_miss_rate(void)
>
> uint64_t xbzrle_mig_pages_overflow(void)
> {
> - return acct_info.xbzrle_overflows;
> + return ram_state.xbzrle_overflows;
> }
>
> static QemuMutex migration_bitmap_mutex;
> @@ -527,7 +517,7 @@ static int save_xbzrle_page(RAMState *rs, QEMUFile *f,
> uint8_t **current_data,
> return 0;
> } else if (encoded_len == -1) {
> trace_save_xbzrle_page_overflow();
> - acct_info.xbzrle_overflows++;
> + rs->xbzrle_overflows++;
> /* update data in the cache */
> if (!last_stage) {
> memcpy(prev_cached_page, *current_data, TARGET_PAGE_SIZE);
> @@ -2003,6 +1993,7 @@ static int ram_save_init_globals(RAMState *rs)
> rs->xbzrle_pages = 0;
> rs->xbzrle_cache_miss = 0;
> rs->xbzrle_cache_miss_rate = 0;
> + rs->xbzrle_overflows = 0;
> migration_bitmap_sync_init(rs);
> qemu_mutex_init(&migration_bitmap_mutex);
>
> @@ -2033,8 +2024,6 @@ static int ram_save_init_globals(RAMState *rs)
> XBZRLE.encoded_buf = NULL;
> return -1;
> }
> -
> - acct_clear();
> }
>
> /* For memory_global_dirty_log_start below. */
> --
> 2.9.3
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
