[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/38] migration: simplify do_compress_ram_page
From: |
Juan Quintela |
Subject: |
[PULL 05/38] migration: simplify do_compress_ram_page |
Date: |
Thu, 27 Jan 2022 16:05:15 +0100 |
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
- [PULL 00/38] Migration 20220127 patches, Juan Quintela, 2022/01/27
- [PULL 02/38] migration: We only need last_stage in two places, Juan Quintela, 2022/01/27
- [PULL 01/38] migration: All this fields are unsigned, Juan Quintela, 2022/01/27
- [PULL 03/38] migration: ram_release_pages() always receive 1 page as argument, Juan Quintela, 2022/01/27
- [PULL 04/38] migration: Remove masking for compression, Juan Quintela, 2022/01/27
- [PULL 05/38] migration: simplify do_compress_ram_page,
Juan Quintela <=
- [PULL 06/38] migration: Move ram_release_pages() call to save_zero_page_to_file(), Juan Quintela, 2022/01/27
- [PULL 07/38] multifd: Use proper maximum compression values, Juan Quintela, 2022/01/27
- [PULL 08/38] multifd: Move iov from pages to params, Juan Quintela, 2022/01/27
- [PULL 09/38] multifd: Make zlib use iov's, Juan Quintela, 2022/01/27
- [PULL 11/38] multifd: Remove send_write() method, Juan Quintela, 2022/01/27
- [PULL 10/38] multifd: Make zstd use iov's, Juan Quintela, 2022/01/27
- [PULL 12/38] multifd: Use a single writev on the send side, Juan Quintela, 2022/01/27
- [PULL 13/38] multifd: Unfold "used" variable by its value, Juan Quintela, 2022/01/27
- [PULL 14/38] multifd: Use normal pages array on the send side, Juan Quintela, 2022/01/27
- [PULL 16/38] multifd: recv side only needs the RAMBlock host address, Juan Quintela, 2022/01/27