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>
Subject: [PATCH v2 09/11] migration: Move ram_flush_compressed_data() to ram-compress.c
Date: Thu, 19 Oct 2023 13:07:22 +0200	[thread overview]
Message-ID: <20231019110724.15324-10-quintela@redhat.com> (raw)
In-Reply-To: <20231019110724.15324-1-quintela@redhat.com>

As we export it, rename it compress_flush_data().

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram-compress.h |  1 +
 migration/ram-compress.c |  9 +++++++++
 migration/ram.c          | 17 ++++-------------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/migration/ram-compress.h b/migration/ram-compress.h
index 636281ed97..7ba01e2882 100644
--- a/migration/ram-compress.h
+++ b/migration/ram-compress.h
@@ -73,5 +73,6 @@ uint64_t ram_compressed_pages(void);
 void update_compress_thread_counts(const CompressParam *param, int bytes_xmit);
 void compress_update_rates(uint64_t page_count);
 int compress_send_queued_data(CompressParam *param);
+void compress_flush_data(void);
 
 #endif
diff --git a/migration/ram-compress.c b/migration/ram-compress.c
index af42cab0fe..1443a1cb45 100644
--- a/migration/ram-compress.c
+++ b/migration/ram-compress.c
@@ -558,3 +558,12 @@ void compress_update_rates(uint64_t page_count)
             compression_counters.compressed_size;
     }
 }
+
+void compress_flush_data(void)
+{
+    if (!migrate_compress()) {
+        return;
+    }
+
+    flush_compressed_data(compress_send_queued_data);
+}
diff --git a/migration/ram.c b/migration/ram.c
index d8b38ed999..4a07406c9a 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1300,15 +1300,6 @@ int compress_send_queued_data(CompressParam *param)
     return len;
 }
 
-static void ram_flush_compressed_data(void)
-{
-    if (!migrate_compress()) {
-        return;
-    }
-
-    flush_compressed_data(compress_send_queued_data);
-}
-
 #define PAGE_ALL_CLEAN 0
 #define PAGE_TRY_AGAIN 1
 #define PAGE_DIRTY_FOUND 2
@@ -1364,7 +1355,7 @@ static int find_dirty_block(RAMState *rs, PageSearchStatus *pss)
              * Also If xbzrle is on, stop using the data compression at this
              * point. In theory, xbzrle can do better than compression.
              */
-            ram_flush_compressed_data();
+            compress_flush_data();
 
             /* Hit the end of the list */
             pss->block = QLIST_FIRST_RCU(&ram_list.blocks);
@@ -2036,7 +2027,7 @@ static bool save_compress_page(RAMState *rs, PageSearchStatus *pss,
      * much CPU resource.
      */
     if (pss->block != pss->last_sent_block) {
-        ram_flush_compressed_data();
+        compress_flush_data();
         return false;
     }
 
@@ -3083,7 +3074,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
              * page is sent in one chunk.
              */
             if (migrate_postcopy_ram()) {
-                ram_flush_compressed_data();
+                compress_flush_data();
             }
 
             /*
@@ -3184,7 +3175,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
         }
         qemu_mutex_unlock(&rs->bitmap_mutex);
 
-        ram_flush_compressed_data();
+        compress_flush_data();
 
         int ret = rdma_registration_stop(f, RAM_CONTROL_FINISH);
         if (ret < 0) {
-- 
2.41.0



  parent reply	other threads:[~2023-10-19 11:51 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 ` [PATCH v2 06/11] migration: Move busy++ to migrate_with_multithread Juan Quintela
2023-10-23 13:49   ` 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 ` Juan Quintela [this message]
2023-10-23 13:59   ` [PATCH v2 09/11] migration: Move ram_flush_compressed_data() to ram-compress.c 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-10-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=farosas@suse.de \
    --cc=leobras@redhat.com \
    --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).