From: Juan Quintela <quintela@redhat.com>
Date: Thu, 19 Oct 2023 11:07:19 +0000 (+0200)
Subject: migration: Move busy++ to migrate_with_multithread
X-Git-Tag: v8.2.0-rc0~43^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=250b1d7ef62b26fde8dc0f8dacad406807d82f1a;p=thirdparty%2Fqemu.git

migration: Move busy++ to migrate_with_multithread

And now we can simplify save_compress_page().

Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231019110724.15324-7-quintela@redhat.com>
---

diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index a991b15b7a6..f56e1f8e693 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 63a575ae904..46209388ec9 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);
 }
 
 /**