[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 05/23] migration: simplify do_compress_ram_page
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [PATCH v4 05/23] migration: simplify do_compress_ram_page |
Date: |
Tue, 11 Jan 2022 20:00:45 +0000 |
User-agent: |
Mutt/2.1.3 (2021-09-10) |
* Juan Quintela (quintela@redhat.com) wrote:
> The goto is not needed at all.
Another dupe,
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Juan Quintela <quintela@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
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
- [PATCH v4 00/23] Migration: Transmit and detect zero pages in the multifd threads, Juan Quintela, 2022/01/11
- [PATCH v4 01/23] migration: All this fields are unsigned, Juan Quintela, 2022/01/11
- [PATCH v4 03/23] migration: ram_release_pages() always receive 1 page as argument, Juan Quintela, 2022/01/11
- [PATCH v4 04/23] migration: Remove masking for compression, Juan Quintela, 2022/01/11
- [PATCH v4 02/23] migration: We only need last_stage in two places, Juan Quintela, 2022/01/11
- [PATCH v4 09/23] multifd: Make zlib use iov's, Juan Quintela, 2022/01/11
- [PATCH v4 05/23] migration: simplify do_compress_ram_page, Juan Quintela, 2022/01/11
- Re: [PATCH v4 05/23] migration: simplify do_compress_ram_page,
Dr. David Alan Gilbert <=
- [PATCH v4 10/23] multifd: Make zstd use iov's, Juan Quintela, 2022/01/11
- [PATCH v4 07/23] multifd: Use proper maximum compression values, Juan Quintela, 2022/01/11
- [PATCH v4 08/23] multifd: Move iov from pages to params, Juan Quintela, 2022/01/11
- [PATCH v4 06/23] migration: Move ram_release_pages() call to save_zero_page_to_file(), Juan Quintela, 2022/01/11
- [PATCH v4 11/23] multifd: Remove send_write() method, Juan Quintela, 2022/01/11