qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>,
	Lukas Straub <lukasstraub2@web.de>,
	Juan Quintela <quintela@redhat.com>
Subject: [PATCH 15/18] migration: save_compress_page() can take block through pss
Date: Tue, 13 Jun 2023 16:57:54 +0200	[thread overview]
Message-ID: <20230613145757.10131-16-quintela@redhat.com> (raw)
In-Reply-To: <20230613145757.10131-1-quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 1bd586c23a..e3ff98a6ce 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1986,7 +1986,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
  * paths to handle it
  */
 static bool save_compress_page(RAMState *rs, PageSearchStatus *pss,
-                               RAMBlock *block, ram_addr_t offset)
+                               ram_addr_t offset)
 {
     if (!migrate_compress()) {
         return false;
@@ -2002,12 +2002,13 @@ static bool save_compress_page(RAMState *rs, PageSearchStatus *pss,
      * We post the fist page as normal page as compression will take
      * much CPU resource.
      */
-    if (block != pss->last_sent_block) {
+    if (pss->block != pss->last_sent_block) {
         ram_flush_compressed_data();
         return false;
     }
 
-    return compress_page_with_multi_thread(block, offset, send_queued_data);
+    return compress_page_with_multi_thread(pss->block, offset,
+                                           send_queued_data);
 }
 
 /**
@@ -2028,7 +2029,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)
         return res;
     }
 
-    if (save_compress_page(rs, pss, block, offset)) {
+    if (save_compress_page(rs, pss, offset)) {
         return 1;
     }
 
-- 
2.40.1



  parent reply	other threads:[~2023-06-13 15:01 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-13 14:57 [PATCH 00/18] Migration compression cleanup Juan Quintela
2023-06-13 14:57 ` [PATCH 01/18] migration: Give one error if trying to set MULTIFD and XBZRLE Juan Quintela
2023-06-22 11:36   ` Lukas Straub
2023-06-22 12:15     ` Juan Quintela
2023-06-13 14:57 ` [PATCH 02/18] migration: Give one error if trying to set COMPRESSION " Juan Quintela
2023-06-22 11:37   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 03/18] migration: RDMA is not compatible with anything else Juan Quintela
2023-06-22 11:44   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 04/18] migration: Remove save_page_use_compression() Juan Quintela
2023-06-13 14:57 ` [PATCH 05/18] migration: Move compression_counters cleanup ram-compress.c Juan Quintela
2023-06-22 11:44   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 06/18] migration: Create populate_compress() Juan Quintela
2023-06-22 11:45   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 07/18] migration: Create ram_compressed_pages() Juan Quintela
2023-06-22 11:45   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 08/18] migration: Move update_compress_threads_counts() to ram-compress.c Juan Quintela
2023-06-22 11:45   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 09/18] migration: Make compress_data_with_multithreads return bool Juan Quintela
2023-06-22 11:46   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 10/18] migration: Simplify compress_page_with_multithread() Juan Quintela
2023-06-22 11:46   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 11/18] migration: Move busy++ to migrate_with_multithread Juan Quintela
2023-06-22 11:46   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 12/18] migration: Create compression_update_rates() Juan Quintela
2023-06-22 11:46   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 13/18] migration: Simplify decompress_data_with_multi_threads() Juan Quintela
2023-06-22 11:47   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 14/18] migration: Use "i" as an for index in ram-compress.c Juan Quintela
2023-06-22 11:47   ` Lukas Straub
2023-06-13 14:57 ` Juan Quintela [this message]
2023-06-22 11:47   ` [PATCH 15/18] migration: save_compress_page() can take block through pss Lukas Straub
2023-06-13 14:57 ` [PATCH 16/18] migration: control_save_page() " Juan Quintela
2023-06-22 11:48   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 17/18] migration: Remove not needed block parameter for save_zero_page* Juan Quintela
2023-06-22 11:48   ` Lukas Straub
2023-06-13 14:57 ` [PATCH 18/18] migration: Remove not needed file " Juan Quintela
2023-06-22 11:48   ` Lukas Straub

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=20230613145757.10131-16-quintela@redhat.com \
    --to=quintela@redhat.com \
    --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).