On Thu, 27 Apr 2023 18:34:36 +0200 Juan Quintela <quint...@redhat.com> wrote:
> Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Lukas Straub <lukasstra...@web.de>
> ---
> migration/ram.c | 9 ---------
> migration/ram.h | 1 -
> migration/rdma.c | 4 +++-
> 3 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index c249a1f468..7d81c4a39e 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -2629,15 +2629,6 @@ static int ram_find_and_save_block(RAMState *rs)
> return pages;
> }
>
> -void acct_update_position(QEMUFile *f, size_t size)
> -{
> - uint64_t pages = size / TARGET_PAGE_SIZE;
> -
> - stat64_add(&mig_stats.normal_pages, pages);
> - ram_transferred_add(size);
> - qemu_file_credit_transfer(f, size);
> -}
> -
> static uint64_t ram_bytes_total_with_ignored(void)
> {
> RAMBlock *block;
> diff --git a/migration/ram.h b/migration/ram.h
> index 3804753ca3..6fffbeb5f1 100644
> --- a/migration/ram.h
> +++ b/migration/ram.h
> @@ -53,7 +53,6 @@ void mig_throttle_counter_reset(void);
>
> uint64_t ram_pagesize_summary(void);
> int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t
> len);
> -void acct_update_position(QEMUFile *f, size_t size);
> void ram_postcopy_migrated_memory_release(MigrationState *ms);
> /* For outgoing discard bitmap */
> void ram_postcopy_send_discard_bitmap(MigrationState *ms);
> diff --git a/migration/rdma.c b/migration/rdma.c
> index 7a9b284c3f..7e747b2595 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -2231,7 +2231,9 @@ retry:
> }
>
> set_bit(chunk, block->transit_bitmap);
> - acct_update_position(f, sge.length);
> + stat64_add(&mig_stats.normal_pages, sge.length /
> qemu_target_page_size());
> + ram_transferred_add(sge.length);
> + qemu_file_credit_transfer(f, sge.length);
> rdma->total_writes++;
>
> return 0;
--
pgpgacnKIsu4F.pgp
Description: OpenPGP digital signature
