[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/38] migration: migration_rate_limit_reset() don't need the QEMU
From: |
Juan Quintela |
Subject: |
[PULL 34/38] migration: migration_rate_limit_reset() don't need the QEMUFile |
Date: |
Tue, 31 Oct 2023 10:01:38 +0100 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231025091117.6342-9-quintela@redhat.com>
---
migration/migration-stats.h | 4 +---
migration/migration-stats.c | 2 +-
migration/migration.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/migration/migration-stats.h b/migration/migration-stats.h
index e3863bf9bb..68f3939188 100644
--- a/migration/migration-stats.h
+++ b/migration/migration-stats.h
@@ -120,10 +120,8 @@ uint64_t migration_rate_get(void);
* migration_rate_reset: Reset the rate limit counter.
*
* This is called when we know we start a new transfer cycle.
- *
- * @f: QEMUFile used for main migration channel
*/
-void migration_rate_reset(QEMUFile *f);
+void migration_rate_reset(void);
/**
* migration_rate_set: Set the maximum amount that can be transferred.
diff --git a/migration/migration-stats.c b/migration/migration-stats.c
index 4ae8c0c722..f690b98a03 100644
--- a/migration/migration-stats.c
+++ b/migration/migration-stats.c
@@ -54,7 +54,7 @@ void migration_rate_set(uint64_t limit)
stat64_set(&mig_stats.rate_limit_max, limit / XFER_LIMIT_RATIO);
}
-void migration_rate_reset(QEMUFile *f)
+void migration_rate_reset(void)
{
stat64_set(&mig_stats.rate_limit_start, migration_transferred_bytes());
}
diff --git a/migration/migration.c b/migration/migration.c
index 04d4546150..a25a2f3c54 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2785,7 +2785,7 @@ static void migration_update_counters(MigrationState *s,
stat64_get(&mig_stats.dirty_bytes_last_sync) / expected_bw_per_ms;
}
- migration_rate_reset(s->to_dst_file);
+ migration_rate_reset();
update_iteration_initial_status(s);
--
2.41.0
- [PULL 17/38] migration: Rename ram_compressed_pages() to compress_ram_pages(), (continued)
- [PULL 17/38] migration: Rename ram_compressed_pages() to compress_ram_pages(), Juan Quintela, 2023/10/31
- [PULL 22/38] migration: migrate 'inc' command option is deprecated., Juan Quintela, 2023/10/31
- [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 <=
- [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, 2023/10/31
- [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