qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Juan Quintela" <quintela@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Fam Zheng" <fam@euphon.net>, "Peter Xu" <peterx@redhat.com>,
	"Michael Tokarev" <mjt@tls.msk.ru>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	qemu-block@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"David Hildenbrand" <david@redhat.com>,
	qemu-trivial@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>
Subject: [PATCH 08/19] migration: Trivial cleanup save_page_header() on same block check
Date: Mon, 21 Nov 2022 14:27:06 +0100	[thread overview]
Message-ID: <20221121132717.63070-9-quintela@redhat.com> (raw)
In-Reply-To: <20221121132717.63070-1-quintela@redhat.com>

From: Peter Xu <peterx@redhat.com>

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

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 7124ff531c..41475431fc 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.38.1



  parent reply	other threads:[~2022-11-21 13:38 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-21 13:26 [PATCH 00/19] Migration patches for 8.8 Juan Quintela
2022-11-21 13:26 ` [PATCH 01/19] multifd: Create page_size fields into both MultiFD{Recv, Send}Params Juan Quintela
2022-11-21 13:27 ` [PATCH 02/19] multifd: Create page_count " Juan Quintela
2022-11-21 13:27 ` [PATCH 03/19] migration: Export ram_transferred_ram() Juan Quintela
2022-11-21 13:27 ` [PATCH 04/19] migration: Export ram_release_page() Juan Quintela
2022-11-21 13:27 ` [PATCH 05/19] migration: Take bitmap mutex when completing ram migration Juan Quintela
2022-11-21 13:27 ` [PATCH 06/19] migration: Add postcopy_preempt_active() Juan Quintela
2022-11-21 13:27 ` [PATCH 07/19] migration: Cleanup xbzrle zero page cache update logic Juan Quintela
2022-11-21 13:27 ` Juan Quintela [this message]
2022-11-21 13:27 ` [PATCH 09/19] migration: Remove RAMState.f references in compression code Juan Quintela
2022-11-21 13:27 ` [PATCH 10/19] migration: Yield bitmap_mutex properly when sending/sleeping Juan Quintela
2022-11-21 13:27 ` [PATCH 11/19] migration: Use atomic ops properly for page accountings Juan Quintela
2022-11-21 13:27 ` [PATCH 12/19] migration: Teach PSS about host page Juan Quintela
2022-11-21 13:27 ` [PATCH 13/19] migration: Introduce pss_channel Juan Quintela
2022-11-21 13:27 ` [PATCH 14/19] migration: Add pss_init() Juan Quintela
2022-11-21 13:27 ` [PATCH 15/19] migration: Make PageSearchStatus part of RAMState Juan Quintela
2022-11-21 13:27 ` [PATCH 16/19] migration: Move last_sent_block into PageSearchStatus Juan Quintela
2022-11-21 13:27 ` [PATCH 17/19] migration: Send requested page directly in rp-return thread Juan Quintela
2022-11-21 13:27 ` [PATCH 18/19] migration: Remove old preempt code around state maintainance Juan Quintela
2022-11-21 13:27 ` [PATCH 19/19] migration: Drop rs->f Juan Quintela
2022-11-21 16:18 ` [PATCH 00/19] Migration patches for 8.8 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=20221121132717.63070-9-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=berrange@redhat.com \
    --cc=david@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=fam@euphon.net \
    --cc=laurent@vivier.eu \
    --cc=marcandre.lureau@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    /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).