On 12/21/21 13:52, Juan Quintela wrote:
> The goto is not needed at all.
>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
> ---
> migration/ram.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 4ee0369d6f..eddc85ffb0 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 & TARGET_PAGE_MASK);
> - 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 & TARGET_PAGE_MASK);
We don't want TARGET_PAGE_MASK anymore here, right?
> + 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
