[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/19] migration/rdma: Unfold last user of acct_update_position()
From: |
Juan Quintela |
Subject: |
[PATCH 06/19] migration/rdma: Unfold last user of acct_update_position() |
Date: |
Thu, 27 Apr 2023 18:34:36 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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;
--
2.40.0
- [PATCH 00/19] migration: Remove QEMUFileHooks, Juan Quintela, 2023/04/27
- [PATCH 01/19] multifd: We already account for this packet on the multifd thread, Juan Quintela, 2023/04/27
- [PATCH 02/19] migration: Move ram_stats to its own file migration-stats.[ch], Juan Quintela, 2023/04/27
- [PATCH 06/19] migration/rdma: Unfold last user of acct_update_position(),
Juan Quintela <=
- [PATCH 07/19] migration/rdma: Unflod ram_control_before_iterate(), Juan Quintela, 2023/04/27
- [PATCH 04/19] migration: Rename RAMStats to MigrationAtomicStats, Juan Quintela, 2023/04/27
- [PATCH 12/19] migration/rdma: It makes no sense to recive that flag without RDMA, Juan Quintela, 2023/04/27
- [PATCH 05/19] migration/rdma: Split the zero page case from acct_update_position, Juan Quintela, 2023/04/27
- [PATCH 09/19] migration/rdma: simplify ram_control_load_hook(), Juan Quintela, 2023/04/27
- [PATCH 13/19] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry, Juan Quintela, 2023/04/27