motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: simplify do_compress_ram_page

Browse source 
The goto is not needed at all.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2021-12-16 09:39:49 +01:00
parent 20d549cb0b
commit e7f2e190e5
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
migration/ram.c
View file

@ -1341,12 +1341,11 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,
{ {
RAMState *rs = ram_state; RAMState *rs = ram_state;
uint8_t *p = block->host + offset; uint8_t *p = block->host + offset;
bool zero_page = false;
int ret; int ret;
if (save_zero_page_to_file(rs, f, block, offset)) { if (save_zero_page_to_file(rs, f, block, offset)) {
zero_page = true; ram_release_page(block->idstr, offset);
goto exit; return true;
} }
save_page_header(rs, f, block, offset | RAM_SAVE_FLAG_COMPRESS_PAGE); 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) { if (ret < 0) {
qemu_file_set_error(migrate_get_current()->to_dst_file, ret); qemu_file_set_error(migrate_get_current()->to_dst_file, ret);
error_report("compressed data failed!"); error_report("compressed data failed!");
return false;
} }
return false;
exit:
ram_release_page(block->idstr, offset);
return zero_page;
} }
static void static void