QEMU-Devel Archive mirror
 help / color / mirror / Atom feed
From: Fabiano Rosas <farosas@suse.de>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
	Will Gyda <vilhelmgyda@gmail.com>, Peter Xu <peterx@redhat.com>
Subject: [PULL 01/13] migration/ram.c: API Conversion qemu_mutex_lock(), and qemu_mutex_unlock() to WITH_QEMU_LOCK_GUARD macro
Date: Thu,  2 May 2024 17:23:04 -0300	[thread overview]
Message-ID: <20240502202316.29924-2-farosas@suse.de> (raw)
In-Reply-To: <20240502202316.29924-1-farosas@suse.de>

From: Will Gyda <vilhelmgyda@gmail.com>

migration/ram.c: API Conversion qemu_mutex_lock(),
and qemu_mutex_unlock() to WITH_QEMU_LOCK_GUARD macro

Signed-off-by: Will Gyda <vilhelmgyda@gmail.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 migration/ram.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index a975c5af16..50df1e9cd2 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1066,14 +1066,14 @@ static void migration_bitmap_sync(RAMState *rs, bool last_stage)
     trace_migration_bitmap_sync_start();
     memory_global_dirty_log_sync(last_stage);
 
-    qemu_mutex_lock(&rs->bitmap_mutex);
-    WITH_RCU_READ_LOCK_GUARD() {
-        RAMBLOCK_FOREACH_NOT_IGNORED(block) {
-            ramblock_sync_dirty_bitmap(rs, block);
+    WITH_QEMU_LOCK_GUARD(&rs->bitmap_mutex) {
+        WITH_RCU_READ_LOCK_GUARD() {
+            RAMBLOCK_FOREACH_NOT_IGNORED(block) {
+                ramblock_sync_dirty_bitmap(rs, block);
+            }
+            stat64_set(&mig_stats.dirty_bytes_last_sync, ram_bytes_remaining());
         }
-        stat64_set(&mig_stats.dirty_bytes_last_sync, ram_bytes_remaining());
     }
-    qemu_mutex_unlock(&rs->bitmap_mutex);
 
     memory_global_after_dirty_log_sync();
     trace_migration_bitmap_sync_end(rs->num_dirty_pages_period);
-- 
2.35.3



  reply	other threads:[~2024-05-02 20:25 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-02 20:23 [PULL 00/13] Migration patches for 2024-05-02 Fabiano Rosas
2024-05-02 20:23 ` Fabiano Rosas [this message]
2024-05-02 20:23 ` [PULL 02/13] migration: move trace-point from migrate_fd_error to migrate_set_error Fabiano Rosas
2024-05-02 20:23 ` [PULL 03/13] migration: process_incoming_migration_co(): complete cleanup on failure Fabiano Rosas
2024-05-02 20:23 ` [PULL 04/13] migration: process_incoming_migration_co(): fix reporting s->error Fabiano Rosas
2024-05-02 20:23 ` [PULL 05/13] migration: process_incoming_migration_co(): rework error reporting Fabiano Rosas
2024-05-02 20:23 ` [PULL 06/13] qapi: introduce exit-on-error parameter for migrate-incoming Fabiano Rosas
2024-05-02 20:23 ` [PULL 07/13] migration: Remove 'skipped' field from MigrationStats Fabiano Rosas
2024-05-02 20:23 ` [PULL 08/13] migration: Remove 'inc' option from migrate command Fabiano Rosas
2024-05-02 20:23 ` [PULL 09/13] migration: Remove 'blk/-b' option from migrate commands Fabiano Rosas
2024-05-02 20:23 ` [PULL 10/13] migration: Remove block migration Fabiano Rosas
2024-05-02 20:23 ` [PULL 11/13] migration: Remove non-multifd compression Fabiano Rosas
2024-05-02 20:23 ` [PULL 12/13] migration: Deprecate fd: for file migration Fabiano Rosas
2024-05-02 20:23 ` [PULL 13/13] hmp/migration: Fix documents for "migrate" command Fabiano Rosas
2024-05-03  6:59   ` Markus Armbruster
2024-05-03 12:51     ` Fabiano Rosas
2024-05-03 13:10       ` Richard Henderson

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=20240502202316.29924-2-farosas@suse.de \
    --to=farosas@suse.de \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=vilhelmgyda@gmail.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 read-only IMAP folder(s) and NNTP newsgroup(s).