From: Juan Quintela <quintela@redhat.com>
Date: Tue, 13 Jun 2023 11:36:24 +0000 (+0200)
Subject: migration: control_save_page() can take block through pss
X-Git-Tag: v8.2.0-rc0~63^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=944853c201bc229ef02f209d2e6e42ada9d745dd;p=thirdparty%2Fqemu.git

migration: control_save_page() can take block through pss

Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration/ram.c b/migration/ram.c
index 378d310fbd0..7f18c1808d0 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1186,12 +1186,12 @@ static int save_zero_page(RAMState *rs, PageSearchStatus *pss, RAMBlock *block,
  *
  * Return true if the pages has been saved, otherwise false is returned.
  */
-static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
+static bool control_save_page(PageSearchStatus *pss,
                               ram_addr_t offset, int *pages)
 {
     int ret;
 
-    ret = rdma_control_save_page(pss->pss_channel, block->offset, offset,
+    ret = rdma_control_save_page(pss->pss_channel, pss->block->offset, offset,
                                  TARGET_PAGE_SIZE);
     if (ret == RAM_SAVE_CONTROL_NOT_SUPP) {
         return false;
@@ -2111,7 +2111,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)
     ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS;
     int res;
 
-    if (control_save_page(pss, block, offset, &res)) {
+    if (control_save_page(pss, offset, &res)) {
         return res;
     }