All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Leonardo Bras <leobras@redhat.com>,
	Hailiang Zhang <zhanghailiang@xfusion.com>,
	Peter Xu <peterx@redhat.com>, Fam Zheng <fam@euphon.net>,
	Juan Quintela <quintela@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH 12/16] migration: migration_rate_limit_reset() don't need the QEMUFile
Date: Tue, 30 May 2023 14:28:09 +0200	[thread overview]
Message-ID: <20230530122813.2674-13-quintela@redhat.com> (raw)
In-Reply-To: <20230530122813.2674-1-quintela@redhat.com>

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 a5f3fcc5ae..df541fa904 100644
--- a/migration/migration-stats.c
+++ b/migration/migration-stats.c
@@ -53,7 +53,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 24e55c5bf3..ab8254e433 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2693,7 +2693,7 @@ static void migration_update_counters(MigrationState *s,
             stat64_get(&mig_stats.dirty_bytes_last_sync) / bandwidth;
     }
 
-    migration_rate_reset(s->to_dst_file);
+    migration_rate_reset();
 
     update_iteration_initial_status(s);
 
-- 
2.40.1



  parent reply	other threads:[~2023-05-30 12:29 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-30 12:27 [PATCH 00/16] Next round of migration atomic counters Juan Quintela
2023-05-30 12:27 ` [PATCH 01/16] qemu-file: Rename qemu_file_transferred_ fast -> noflush Juan Quintela
2023-05-30 12:36   ` Philippe Mathieu-Daudé
2023-05-30 12:39     ` Philippe Mathieu-Daudé
2023-05-30 12:27 ` [PATCH 02/16] migration: Change qemu_file_transferred to noflush Juan Quintela
2023-05-30 12:37   ` Philippe Mathieu-Daudé
2023-05-30 12:28 ` [PATCH 03/16] migration: Use qemu_file_transferred_noflush() for block migration Juan Quintela
2023-05-30 13:45   ` Fabiano Rosas
2023-05-30 12:28 ` [PATCH 04/16] qemu-file: Don't call qemu_fflush() for read only files Juan Quintela
2023-05-30 14:06   ` Fabiano Rosas
2023-05-30 17:01   ` Richard Henderson
2023-05-30 17:06     ` Juan Quintela
2023-05-30 17:14       ` Richard Henderson
2023-05-30 17:26         ` Juan Quintela
2023-05-30 17:36   ` Juan Quintela
2023-05-30 12:28 ` [PATCH 05/16] qemu-file: We only call qemu_file_transferred_* on the sending side Juan Quintela
2023-05-30 12:28 ` [PATCH 06/16] qemu_file: Use a stat64 for qemu_file_transferred Juan Quintela
2023-05-30 12:28 ` [PATCH 07/16] qemu_file: total_transferred is not used anymore Juan Quintela
2023-05-30 12:28 ` [PATCH 08/16] migration: Use the number of transferred bytes directly Juan Quintela
2023-05-30 12:28 ` [PATCH 09/16] qemu_file: Remove unused qemu_file_transferred() Juan Quintela
2023-05-30 12:28 ` [PATCH 10/16] qemu-file: Remove _noflush from qemu_file_transferred_noflush() Juan Quintela
2023-05-30 13:10   ` Fabiano Rosas
2023-05-30 17:57     ` Juan Quintela
2023-05-30 12:28 ` [PATCH 11/16] migration: migration_transferred_bytes() don't need the QEMUFile Juan Quintela
2023-05-30 12:34   ` Philippe Mathieu-Daudé
2023-05-30 12:28 ` Juan Quintela [this message]
2023-05-30 12:34   ` [PATCH 12/16] migration: migration_rate_limit_reset() " Philippe Mathieu-Daudé
2023-05-30 12:28 ` [PATCH 13/16] qemu-file: Simplify qemu_file_get_error() Juan Quintela
2023-05-30 13:41   ` Fabiano Rosas
2023-05-30 12:28 ` [PATCH 14/16] migration: Use migration_transferred_bytes() Juan Quintela
2023-05-30 12:28 ` [PATCH 15/16] migration: Remove transferred atomic counter Juan Quintela
2023-05-30 12:28 ` [PATCH 16/16] qemu-file: Make qemu_fflush() return errors Juan Quintela
2023-05-30 12:41   ` Philippe Mathieu-Daudé
2023-05-30 12:40 ` [PATCH 00/16] Next round of migration atomic counters 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=20230530122813.2674-13-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=fam@euphon.net \
    --cc=leobras@redhat.com \
    --cc=peterx@redhat.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.