[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 33/38] migration: migration_transferred_bytes() don't need the QEM
From: |
Juan Quintela |
Subject: |
[PULL 33/38] migration: migration_transferred_bytes() don't need the QEMUFile |
Date: |
Tue, 31 Oct 2023 10:01:37 +0100 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231025091117.6342-8-quintela@redhat.com>
---
migration/migration-stats.h | 4 +---
migration/migration-stats.c | 6 +++---
migration/migration.c | 6 +++---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/migration/migration-stats.h b/migration/migration-stats.h
index b7795e7914..e3863bf9bb 100644
--- a/migration/migration-stats.h
+++ b/migration/migration-stats.h
@@ -137,11 +137,9 @@ void migration_rate_set(uint64_t new_rate);
/**
* migration_transferred_bytes: Return number of bytes transferred
*
- * @f: QEMUFile used for main migration channel
- *
* Returns how many bytes have we transferred since the beginning of
* the migration. It accounts for bytes sent through any migration
* channel, multifd, qemu_file, rdma, ....
*/
-uint64_t migration_transferred_bytes(QEMUFile *f);
+uint64_t migration_transferred_bytes(void);
#endif
diff --git a/migration/migration-stats.c b/migration/migration-stats.c
index 1d9197b4c3..4ae8c0c722 100644
--- a/migration/migration-stats.c
+++ b/migration/migration-stats.c
@@ -30,7 +30,7 @@ bool migration_rate_exceeded(QEMUFile *f)
}
uint64_t rate_limit_start = stat64_get(&mig_stats.rate_limit_start);
- uint64_t rate_limit_current = migration_transferred_bytes(f);
+ uint64_t rate_limit_current = migration_transferred_bytes();
uint64_t rate_limit_used = rate_limit_current - rate_limit_start;
if (rate_limit_max > 0 && rate_limit_used > rate_limit_max) {
@@ -56,10 +56,10 @@ void migration_rate_set(uint64_t limit)
void migration_rate_reset(QEMUFile *f)
{
- stat64_set(&mig_stats.rate_limit_start, migration_transferred_bytes(f));
+ stat64_set(&mig_stats.rate_limit_start, migration_transferred_bytes());
}
-uint64_t migration_transferred_bytes(QEMUFile *f)
+uint64_t migration_transferred_bytes(void)
{
uint64_t multifd = stat64_get(&mig_stats.multifd_bytes);
uint64_t rdma = stat64_get(&mig_stats.rdma_bytes);
diff --git a/migration/migration.c b/migration/migration.c
index cb2d7161b5..04d4546150 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2704,7 +2704,7 @@ static MigThrError migration_detect_error(MigrationState
*s)
static void migration_calculate_complete(MigrationState *s)
{
- uint64_t bytes = migration_transferred_bytes(s->to_dst_file);
+ uint64_t bytes = migration_transferred_bytes();
int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
int64_t transfer_time;
@@ -2730,7 +2730,7 @@ static void
update_iteration_initial_status(MigrationState *s)
* wrong speed calculation.
*/
s->iteration_start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
- s->iteration_initial_bytes = migration_transferred_bytes(s->to_dst_file);
+ s->iteration_initial_bytes = migration_transferred_bytes();
s->iteration_initial_pages = ram_get_total_transferred_pages();
}
@@ -2749,7 +2749,7 @@ static void migration_update_counters(MigrationState *s,
}
switchover_bw = migrate_avail_switchover_bandwidth();
- current_bytes = migration_transferred_bytes(s->to_dst_file);
+ current_bytes = migration_transferred_bytes();
transferred = current_bytes - s->iteration_initial_bytes;
time_spent = current_time - s->iteration_start_time;
bandwidth = (double)transferred / time_spent;
--
2.41.0
- [PULL 23/38] migration: migrate 'blk' command option is deprecated., (continued)
- [PULL 23/38] migration: migrate 'blk' command option is deprecated., Juan Quintela, 2023/10/31
- [PULL 26/38] migration: Stop migration immediately in RDMA error paths, Juan Quintela, 2023/10/31
- [PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer, Juan Quintela, 2023/10/31
- [PULL 29/38] qemu_file: total_transferred is not used anymore, Juan Quintela, 2023/10/31
- [PULL 25/38] migration: Deprecate old compression method, Juan Quintela, 2023/10/31
- [PULL 24/38] migration: Deprecate block migration, Juan Quintela, 2023/10/31
- [PULL 28/38] qemu_file: Use a stat64 for qemu_file_transferred, Juan Quintela, 2023/10/31
- [PULL 32/38] qemu-file: Remove _noflush from qemu_file_transferred_noflush(), Juan Quintela, 2023/10/31
- [PULL 34/38] migration: migration_rate_limit_reset() don't need the QEMUFile, Juan Quintela, 2023/10/31
- [PULL 30/38] migration: Use the number of transferred bytes directly, Juan Quintela, 2023/10/31
- [PULL 33/38] migration: migration_transferred_bytes() don't need the QEMUFile,
Juan Quintela <=
- [PULL 36/38] migration: Use migration_transferred_bytes(), Juan Quintela, 2023/10/31
- [PULL 31/38] qemu_file: Remove unused qemu_file_transferred(), Juan Quintela, 2023/10/31
- [PULL 37/38] migration: Remove transferred atomic counter, Juan Quintela, 2023/10/31
- [PULL 38/38] qemu-file: Make qemu_fflush() return errors, Juan Quintela, 2023/10/31
- [PULL 35/38] qemu-file: Simplify qemu_file_get_error(), Juan Quintela, 2023/10/31
- Re: [PULL 00/38] Migration 20231031 patches, Stefan Hajnoczi, 2023/10/31