[PATCH 03/14] migration: Trivial cleanup save_page_header() on same block check

From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	Manish Mishra <manish.mishra@nutanix.com>,
	peterx@redhat.com, Juan Quintela <quintela@redhat.com>,
	Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
	ani@anisinha.ca, "Daniel P . Berrange" <berrange@redhat.com>
Subject: [PATCH 03/14] migration: Trivial cleanup save_page_header() on same block check
Date: Tue, 20 Sep 2022 18:50:55 -0400	[thread overview]
Message-ID: <20220920225106.48451-4-peterx@redhat.com> (raw)
In-Reply-To: <20220920225106.48451-1-peterx@redhat.com>

The 2nd check on RAM_SAVE_FLAG_CONTINUE is a bit redundant.  Use a boolean
to be clearer.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/ram.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index fc59c052cf..62ff2c1469 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -661,14 +661,15 @@ static size_t save_page_header(RAMState *rs, QEMUFile *f,  RAMBlock *block,
                                ram_addr_t offset)
 {
     size_t size, len;
+    bool same_block = (block == rs->last_sent_block);
 
-    if (block == rs->last_sent_block) {
+    if (same_block) {
         offset |= RAM_SAVE_FLAG_CONTINUE;
     }
     qemu_put_be64(f, offset);
     size = 8;
 
-    if (!(offset & RAM_SAVE_FLAG_CONTINUE)) {
+    if (!same_block) {
         len = strlen(block->idstr);
         qemu_put_byte(f, len);
         qemu_put_buffer(f, (uint8_t *)block->idstr, len);
-- 
2.32.0


