From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Peter Xu" <peterx@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Ani Sinha" <ani@anisinha.ca>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Eric Blake" <eblake@redhat.com>,
"Hannes Reinecke" <hare@suse.com>,
"Vikram Garhwal" <fnu.vikram@xilinx.com>,
qemu-block@nongnu.org, "Juan Quintela" <quintela@redhat.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Pavel Pisa" <pisa@cmp.felk.cvut.cz>,
"Alistair Francis" <alistair@alistair23.me>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Greg Kurz" <groug@kaod.org>,
qemu-arm@nongnu.org, "Cédric Le Goater" <clg@kaod.org>,
"Igor Mammedov" <imammedo@redhat.com>,
"Stafford Horne" <shorne@gmail.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Laurent Vivier" <laurent@vivier.eu>,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 05/36] migration: simplify do_compress_ram_page
Date: Fri, 28 Jan 2022 19:30:02 +0100 [thread overview]
Message-ID: <20220128183033.31998-6-quintela@redhat.com> (raw)
In-Reply-To: <20220128183033.31998-1-quintela@redhat.com>
The goto is not needed at all.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/ram.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index fa49d22e69..422c6bce28 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1341,12 +1341,11 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,
{
RAMState *rs = ram_state;
uint8_t *p = block->host + offset;
- bool zero_page = false;
int ret;
if (save_zero_page_to_file(rs, f, block, offset)) {
- zero_page = true;
- goto exit;
+ ram_release_page(block->idstr, offset);
+ return true;
}
save_page_header(rs, f, block, offset | RAM_SAVE_FLAG_COMPRESS_PAGE);
@@ -1361,12 +1360,8 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,
if (ret < 0) {
qemu_file_set_error(migrate_get_current()->to_dst_file, ret);
error_report("compressed data failed!");
- return false;
}
-
-exit:
- ram_release_page(block->idstr, offset);
- return zero_page;
+ return false;
}
static void
--
2.34.1
next prev parent reply other threads:[~2022-01-28 19:06 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 18:29 [PULL 00/36] Migration 20220128 patches Juan Quintela
2022-01-28 18:29 ` [PULL 01/36] migration: All this fields are unsigned Juan Quintela
2022-01-28 18:29 ` [PULL 02/36] migration: We only need last_stage in two places Juan Quintela
2022-01-28 18:30 ` [PULL 03/36] migration: ram_release_pages() always receive 1 page as argument Juan Quintela
2022-01-28 18:30 ` [PULL 04/36] migration: Remove masking for compression Juan Quintela
2022-01-28 18:30 ` Juan Quintela [this message]
2022-01-28 18:30 ` [PULL 06/36] migration: Move ram_release_pages() call to save_zero_page_to_file() Juan Quintela
2022-01-28 18:30 ` [PULL 07/36] multifd: Use proper maximum compression values Juan Quintela
2022-01-28 18:30 ` [PULL 08/36] multifd: Move iov from pages to params Juan Quintela
2022-01-28 18:30 ` [PULL 09/36] multifd: Make zlib use iov's Juan Quintela
2022-01-28 18:30 ` [PULL 10/36] multifd: Make zstd " Juan Quintela
2022-01-28 18:30 ` [PULL 11/36] multifd: Remove send_write() method Juan Quintela
2022-01-28 18:30 ` [PULL 12/36] multifd: Use a single writev on the send side Juan Quintela
2022-01-28 18:30 ` [PULL 13/36] multifd: Unfold "used" variable by its value Juan Quintela
2022-01-28 18:30 ` [PULL 14/36] multifd: Use normal pages array on the send side Juan Quintela
2022-01-28 18:30 ` [PULL 15/36] multifd: Use normal pages array on the recv side Juan Quintela
2022-01-28 18:30 ` [PULL 16/36] multifd: recv side only needs the RAMBlock host address Juan Quintela
2022-01-28 18:30 ` [PULL 17/36] multifd: Rename pages_used to normal_pages Juan Quintela
2022-01-28 18:30 ` [PULL 18/36] Remove unnecessary minimum_version_id_old fields Juan Quintela
2022-01-28 18:30 ` [PULL 19/36] migration/migration.c: Add missed default error handler for migration state Juan Quintela
2022-01-28 18:30 ` [PULL 20/36] migration/migration.c: Avoid COLO boot in postcopy migration Juan Quintela
2022-01-28 18:30 ` [PULL 21/36] migration/migration.c: Remove the MIGRATION_STATUS_ACTIVE when migration finished Juan Quintela
2022-01-28 18:30 ` [PULL 22/36] migration: Report the error returned when save_live_iterate fails Juan Quintela
2022-01-28 18:30 ` [PULL 23/36] migration/ram: clean up unused comment Juan Quintela
2022-01-28 18:30 ` [PULL 24/36] migration: Drop dead code of ram_debug_dump_bitmap() Juan Quintela
2022-01-28 18:30 ` [PULL 25/36] migration: Don't return for postcopy_chunk_hostpages() Juan Quintela
2022-01-28 18:30 ` [PULL 26/36] migration: Drop postcopy_chunk_hostpages() Juan Quintela
2022-01-28 18:30 ` [PULL 27/36] migration: Do chunk page in postcopy_each_ram_send_discard() Juan Quintela
2022-01-28 18:30 ` [PULL 28/36] migration: Drop return code for disgard ram process Juan Quintela
2022-01-28 18:30 ` [PULL 29/36] migration: Don't return for postcopy_send_discard_bm_ram() Juan Quintela
2022-01-28 18:30 ` [PULL 30/36] migration: Introduce ram_transferred_add() Juan Quintela
2022-01-28 18:30 ` [PULL 31/36] migration: Tally pre-copy, downtime and post-copy bytes independently Juan Quintela
2022-01-28 18:30 ` [PULL 32/36] migration: No off-by-one for pss->page update in host page size Juan Quintela
2022-01-28 18:30 ` [PULL 33/36] migration: Enable UFFD_FEATURE_THREAD_ID even without blocktime feat Juan Quintela
2022-01-28 18:30 ` [PULL 34/36] migration: Add postcopy_has_request() Juan Quintela
2022-01-28 18:30 ` [PULL 35/36] migration: Simplify unqueue_page() Juan Quintela
2022-01-28 18:30 ` [PULL 36/36] migration: Move temp page setup and cleanup into separate functions Juan Quintela
2022-01-30 10:00 ` [PULL 00/36] Migration 20220128 patches Peter Maydell
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=20220128183033.31998-6-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=Andrew.Baumann@microsoft.com \
--cc=alistair@alistair23.me \
--cc=ani@anisinha.ca \
--cc=armbru@redhat.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=edgar.iglesias@gmail.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=fnu.vikram@xilinx.com \
--cc=groug@kaod.org \
--cc=hare@suse.com \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=laurent@vivier.eu \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=pisa@cmp.felk.cvut.cz \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=shorne@gmail.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).