Message ID | 20220920225106.48451-4-peterx@redhat.com |
---|---|
State | New |
Headers | show |
Series | migration: Postcopy Preempt-Full | expand |
* Peter Xu (peterx@redhat.com) wrote: > 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> Reviewed-by: Dr. David Alan Gilbert <dgilbert@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 >
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);
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(-)