diff mbox series

[v2,06/11] migration: Move busy++ to migrate_with_multithread

Message ID 20231019110724.15324-7-quintela@redhat.com (mailing list archive)
State New, archived
Headers show
Series Migration compression cleanup | expand

Commit Message

Juan Quintela Oct. 19, 2023, 11:07 a.m. UTC 
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(-)

Comments

Fabiano Rosas Oct. 23, 2023, 1:49 p.m. UTC | #1 
eviewed-by: Fabiano Rosas <farosas@suse.de>Juan Quintela <quintela@redhat.com> writes:

> And now we can simplify save_compress_page().
>
> Reviewed-by: Lukas Straub <lukasstraub2@web.de>
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Fabiano Rosas <farosas@suse.de>
diff mbox series

Patch

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);
 }
 
 /**