qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fabiano Rosas <farosas@suse.de>,
	Leonardo Bras <leobras@redhat.com>, Peter Xu <peterx@redhat.com>,
	Juan Quintela <quintela@redhat.com>,
	Lukas Straub <lukasstraub2@web.de>
Subject: [PATCH v2 06/11] migration: Move busy++ to migrate_with_multithread
Date: Thu, 19 Oct 2023 13:07:19 +0200	[thread overview]
Message-ID: <20231019110724.15324-7-quintela@redhat.com> (raw)
In-Reply-To: <20231019110724.15324-1-quintela@redhat.com>

And now we can simplify save_compress_page().

Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram-compress.c | 1 +
 migration/ram.c          | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index a991b15b7a..f56e1f8e69 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -291,6 +291,7 @@ bool compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset,
         }
         if (!wait) {
             qemu_mutex_unlock(&comp_done_lock);
+            compression_counters.busy++;
             return false;
         }
         /*
diff --git a/migration/ram.c b/migration/ram.c
index de7878c46e..a3c5fcc549 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2067,12 +2067,8 @@ static bool save_compress_page(RAMState *rs, PageSearchStatus *pss,
         return false;
     }
 
-    if (compress_page_with_multi_thread(pss->block, offset, send_queued_data)) {
-        return true;
-    }
-
-    compression_counters.busy++;
-    return false;
+    return compress_page_with_multi_thread(pss->block, offset,
+                                           send_queued_data);
 }
 
 /**
-- 
2.41.0



  parent reply	other threads:[~2023-10-19 12:17 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-19 11:07 [PATCH v2 00/11] Migration compression cleanup Juan Quintela
2023-10-19 11:07 ` [PATCH v2 01/11] migration: Give one error if trying to set MULTIFD and XBZRLE Juan Quintela
2023-10-23 13:30   ` Fabiano Rosas
2023-10-19 11:07 ` [PATCH v2 02/11] migration: Give one error if trying to set COMPRESSION " Juan Quintela
2023-10-23 13:32   ` Fabiano Rosas
2023-10-19 11:07 ` [PATCH v2 03/11] migration: Remove save_page_use_compression() Juan Quintela
2023-10-23 13:34   ` Fabiano Rosas
2023-10-19 11:07 ` [PATCH v2 04/11] migration: Make compress_data_with_multithreads return bool Juan Quintela
2023-10-23 13:40   ` Fabiano Rosas
2023-10-19 11:07 ` [PATCH v2 05/11] migration: Simplify compress_page_with_multithread() Juan Quintela
2023-10-23 13:42   ` Fabiano Rosas
2023-10-19 11:07 ` Juan Quintela [this message]
2023-10-23 13:49   ` [PATCH v2 06/11] migration: Move busy++ to migrate_with_multithread Fabiano Rosas
2023-10-19 11:07 ` [PATCH v2 07/11] migration: Create compress_update_rates() Juan Quintela
2023-10-23 13:57   ` Fabiano Rosas
2023-10-24 10:29     ` Juan Quintela
2023-10-19 11:07 ` [PATCH v2 08/11] migration: Export send_queued_data() Juan Quintela
2023-10-23 13:58   ` Fabiano Rosas
2023-10-19 11:07 ` [PATCH v2 09/11] migration: Move ram_flush_compressed_data() to ram-compress.c Juan Quintela
2023-10-23 13:59   ` Fabiano Rosas
2023-10-19 11:07 ` [PATCH v2 10/11] migration: Merge flush_compressed_data() and compress_flush_data() Juan Quintela
2023-10-23 14:00   ` Fabiano Rosas
2023-10-19 11:07 ` [PATCH v2 11/11] migration: Rename ram_compressed_pages() to compress_ram_pages() Juan Quintela
2023-10-23 14:00   ` Fabiano Rosas
2023-10-19 11:43 ` [PATCH v2 00/11] Migration compression cleanup 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=20231019110724.15324-7-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=farosas@suse.de \
    --cc=leobras@redhat.com \
    --cc=lukasstraub2@web.de \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).