From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Stefan Hajnoczi" <stefanha@redhat.com>,
"Fam Zheng" <fam@euphon.net>, "Peter Xu" <peterx@redhat.com>,
"Hailiang Zhang" <zhanghailiang@xfusion.com>,
"Fabiano Rosas" <farosas@suse.de>,
"Li Zhijian" <lizhijian@fujitsu.com>,
qemu-block@nongnu.org, "Juan Quintela" <quintela@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 08/12] migration: migration_rate_limit_reset() don't need the QEMUFile
Date: Wed, 25 Oct 2023 11:11:13 +0200 [thread overview]
Message-ID: <20231025091117.6342-9-quintela@redhat.com> (raw)
In-Reply-To: <20231025091117.6342-1-quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Juan Quintela <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 e199d2f50d..bb62244288 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2775,7 +2775,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
next prev parent reply other threads:[~2023-10-25 9:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 9:11 [PATCH v2 00/12] migration: Yet another round of atomic counters Juan Quintela
2023-10-25 9:11 ` [PATCH v2 01/12] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer Juan Quintela
2023-10-25 13:14 ` Fabiano Rosas
2023-10-25 9:11 ` [PATCH v2 02/12] qemu_file: Use a stat64 for qemu_file_transferred Juan Quintela
2023-10-25 9:11 ` [PATCH v2 03/12] qemu_file: total_transferred is not used anymore Juan Quintela
2023-10-25 9:11 ` [PATCH v2 04/12] migration: Use the number of transferred bytes directly Juan Quintela
2023-10-25 9:11 ` [PATCH v2 05/12] qemu_file: Remove unused qemu_file_transferred() Juan Quintela
2023-10-25 9:11 ` [PATCH v2 06/12] qemu-file: Remove _noflush from qemu_file_transferred_noflush() Juan Quintela
2023-10-25 9:11 ` [PATCH v2 07/12] migration: migration_transferred_bytes() don't need the QEMUFile Juan Quintela
2023-10-25 9:11 ` Juan Quintela [this message]
2023-10-25 9:11 ` [PATCH v2 09/12] qemu-file: Simplify qemu_file_get_error() Juan Quintela
2023-10-25 9:11 ` [PATCH v2 10/12] migration: Use migration_transferred_bytes() Juan Quintela
2023-10-25 9:11 ` [PATCH v2 11/12] migration: Remove transferred atomic counter Juan Quintela
2023-10-25 9:11 ` [PATCH v2 12/12] qemu-file: Make qemu_fflush() return errors Juan Quintela
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231025091117.6342-9-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=fam@euphon.net \
--cc=farosas@suse.de \
--cc=leobras@redhat.com \
--cc=lizhijian@fujitsu.com \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=zhanghailiang@xfusion.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).