diff options
author | Juan Quintela <quintela@redhat.com> | 2023-04-27 17:12:03 +0200 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2023-05-03 11:24:20 +0200 |
commit | 5690756d7c598e1b03935f89f6a8038af2e018b6 (patch) | |
tree | a29eb6d4fa1b13ddeb043f7ea46a38a6506df173 /migration | |
parent | c61d2faa934ecafbba42d5e410298115a483175e (diff) | |
download | qemu-5690756d7c598e1b03935f89f6a8038af2e018b6.zip qemu-5690756d7c598e1b03935f89f6a8038af2e018b6.tar.gz qemu-5690756d7c598e1b03935f89f6a8038af2e018b6.tar.bz2 |
migration/rdma: Unfold last user of acct_update_position()
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Diffstat (limited to 'migration')
-rw-r--r-- | migration/ram.c | 9 | ||||
-rw-r--r-- | migration/ram.h | 1 | ||||
-rw-r--r-- | migration/rdma.c | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/migration/ram.c b/migration/ram.c index c249a1f..7d81c4a 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 3804753..6fffbeb 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 7a9b284..7e747b2 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; |