From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Dr . David Alan Gilbert" <dgilbert@redhat.com>,
peterx@redhat.com, "Daniel P . Berrange" <berrange@redhat.com>,
Juan Quintela <quintela@redhat.com>,
ani@anisinha.ca,
Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
Manish Mishra <manish.mishra@nutanix.com>
Subject: [PATCH v2 04/15] migration: Trivial cleanup save_page_header() on same block check
Date: Tue, 11 Oct 2022 17:55:48 -0400 [thread overview]
Message-ID: <20221011215559.602584-5-peterx@redhat.com> (raw)
In-Reply-To: <20221011215559.602584-1-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>
---
migration/ram.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 562646609e..c90feedb13 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.37.3
next prev parent reply other threads:[~2022-10-11 22:09 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-11 21:55 [PATCH v2 00/15] migration: Postcopy Preempt-Full Peter Xu
2022-10-11 21:55 ` [PATCH v2 01/15] migration: Take bitmap mutex when completing ram migration Peter Xu
2022-10-12 16:14 ` Dr. David Alan Gilbert
2022-11-14 15:06 ` Juan Quintela
2022-10-11 21:55 ` [PATCH v2 02/15] migration: Add postcopy_preempt_active() Peter Xu
2022-11-14 15:07 ` Juan Quintela
2022-10-11 21:55 ` [PATCH v2 03/15] migration: Cleanup xbzrle zero page cache update logic Peter Xu
2022-11-14 15:08 ` Juan Quintela
2022-10-11 21:55 ` Peter Xu [this message]
2022-11-14 15:08 ` [PATCH v2 04/15] migration: Trivial cleanup save_page_header() on same block check Juan Quintela
2022-10-11 21:55 ` [PATCH v2 05/15] migration: Remove RAMState.f references in compression code Peter Xu
2022-11-14 15:09 ` Juan Quintela
2022-10-11 21:55 ` [PATCH v2 06/15] migration: Yield bitmap_mutex properly when sending/sleeping Peter Xu
2022-10-12 16:43 ` Dr. David Alan Gilbert
2022-10-12 17:51 ` Peter Xu
2022-10-13 16:19 ` Peter Xu
2022-10-13 16:37 ` Dr. David Alan Gilbert
2022-11-15 9:19 ` Juan Quintela
2022-10-11 21:55 ` [PATCH v2 07/15] migration: Use atomic ops properly for page accountings Peter Xu
2022-11-14 15:14 ` Juan Quintela
2022-10-11 21:55 ` [PATCH v2 08/15] migration: Teach PSS about host page Peter Xu
2022-10-11 21:55 ` [PATCH v2 09/15] migration: Introduce pss_channel Peter Xu
2022-10-11 21:55 ` [PATCH v2 10/15] migration: Add pss_init() Peter Xu
2022-10-11 21:55 ` [PATCH v2 11/15] migration: Make PageSearchStatus part of RAMState Peter Xu
2022-10-11 21:55 ` [PATCH v2 12/15] migration: Move last_sent_block into PageSearchStatus Peter Xu
2022-11-14 15:19 ` Juan Quintela
2022-10-11 21:55 ` [PATCH v2 13/15] migration: Send requested page directly in rp-return thread Peter Xu
2022-10-11 21:55 ` [PATCH v2 14/15] migration: Remove old preempt code around state maintainance Peter Xu
2022-11-14 15:19 ` Juan Quintela
2022-10-11 21:55 ` [PATCH v2 15/15] migration: Drop rs->f Peter Xu
2022-11-14 15:18 ` 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=20221011215559.602584-5-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=ani@anisinha.ca \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lsoaresp@redhat.com \
--cc=manish.mishra@nutanix.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@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).