aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2021-12-16 09:39:49 +0100
committerJuan Quintela <quintela@redhat.com>2022-01-28 15:38:23 +0100
commite7f2e190e5d522589cb6db327a99960137a7473b (patch)
treec50ec63893fb43842e22d5440873134c0769f1e5 /migration
parent20d549cb0b6c8a9df8690d8e97505aa785036472 (diff)
downloadqemu-e7f2e190e5d522589cb6db327a99960137a7473b.zip
qemu-e7f2e190e5d522589cb6db327a99960137a7473b.tar.gz
qemu-e7f2e190e5d522589cb6db327a99960137a7473b.tar.bz2
migration: simplify do_compress_ram_page
The goto is not needed at all. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/ram.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/migration/ram.c b/migration/ram.c
index fa49d22..422c6bc 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