qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Leonardo Bras" <leobras@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Peter Xu" <peterx@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>
Subject: [PATCH v2 3/6] migration: ram_release_pages() always receive 1 page as argument
Date: Tue, 21 Dec 2021 13:52:32 +0100	[thread overview]
Message-ID: <20211221125235.67414-4-quintela@redhat.com> (raw)
In-Reply-To: <20211221125235.67414-1-quintela@redhat.com>

Remove the pages argument. And s/pages/page/

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

--

Use 1LL instead of casts

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

diff --git a/migration/ram.c b/migration/ram.c
index 7223b0d8ca..0b98862b9e 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1204,13 +1204,13 @@ static int save_zero_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
     return -1;
 }
 
-static void ram_release_pages(const char *rbname, uint64_t offset, int pages)
+static void ram_release_page(const char *rbname, uint64_t offset)
 {
     if (!migrate_release_ram() || !migration_in_postcopy()) {
         return;
     }
 
-    ram_discard_range(rbname, offset, ((ram_addr_t)pages) << TARGET_PAGE_BITS);
+    ram_discard_range(rbname, offset, 1ULL << TARGET_PAGE_BITS);
 }
 
 /*
@@ -1365,7 +1365,7 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,
     }
 
 exit:
-    ram_release_pages(block->idstr, offset & TARGET_PAGE_MASK, 1);
+    ram_release_page(block->idstr, offset & TARGET_PAGE_MASK);
     return zero_page;
 }
 
@@ -2153,7 +2153,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)
             xbzrle_cache_zero_page(rs, block->offset + offset);
             XBZRLE_cache_unlock();
         }
-        ram_release_pages(block->idstr, offset, res);
+        ram_release_page(block->idstr, offset);
         return res;
     }
 
-- 
2.33.1



  parent reply	other threads:[~2021-12-21 12:58 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-21 12:52 [PATCH v2 0/6] migration: misc cleanups Juan Quintela
2021-12-21 12:52 ` [PATCH v2 1/6] migration: All this fields are unsigned Juan Quintela
2021-12-24  7:12   ` Peter Xu
2021-12-24 16:38     ` Juan Quintela
2021-12-21 12:52 ` [PATCH v2 2/6] migration: We only need last_stage in two places Juan Quintela
2021-12-24  7:22   ` Peter Xu
2021-12-21 12:52 ` Juan Quintela [this message]
2021-12-24  7:24   ` [PATCH v2 3/6] migration: ram_release_pages() always receive 1 page as argument Peter Xu
2021-12-21 12:52 ` [PATCH v2 4/6] migration: Remove masking for compression Juan Quintela
2021-12-21 12:52 ` [PATCH v2 5/6] migration: simplify do_compress_ram_page Juan Quintela
2021-12-21 13:29   ` Philippe Mathieu-Daudé
2021-12-24  7:28     ` Peter Xu
2021-12-21 12:52 ` [PATCH v2 6/6] migration: Move ram_release_pages() call to save_zero_page_to_file() Juan Quintela
2021-12-24  7:35   ` Peter Xu

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=20211221125235.67414-4-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=leobras@redhat.com \
    --cc=peterx@redhat.com \
    --cc=philmd@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).