[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 13/21] multifd: multifd_send_sync_main only needs the qemu
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [PATCH v3 13/21] multifd: multifd_send_sync_main only needs the qemufile |
Date: |
Fri, 24 Jan 2020 11:40:15 +0000 |
User-agent: |
Mutt/1.13.0 (2019-11-30) |
* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
> ---
> migration/ram.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index d4c829bc77..2783dc60f4 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -1082,7 +1082,7 @@ void multifd_save_cleanup(void)
> multifd_send_state = NULL;
> }
>
> -static void multifd_send_sync_main(RAMState *rs)
> +static void multifd_send_sync_main(QEMUFile *f)
> {
> int i;
>
> @@ -1090,7 +1090,7 @@ static void multifd_send_sync_main(RAMState *rs)
> return;
> }
> if (multifd_send_state->pages->used) {
> - if (multifd_send_pages(rs->f) < 0) {
> + if (multifd_send_pages(f) < 0) {
> error_report("%s: multifd_send_pages fail", __func__);
> return;
> }
> @@ -1111,7 +1111,7 @@ static void multifd_send_sync_main(RAMState *rs)
> p->packet_num = multifd_send_state->packet_num++;
> p->flags |= MULTIFD_FLAG_SYNC;
> p->pending_job++;
> - qemu_file_update_transfer(rs->f, p->packet_len);
> + qemu_file_update_transfer(f, p->packet_len);
> ram_counters.multifd_bytes += p->packet_len;
> ram_counters.transferred += p->packet_len;
> qemu_mutex_unlock(&p->mutex);
> @@ -3426,7 +3426,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
> ram_control_before_iterate(f, RAM_CONTROL_SETUP);
> ram_control_after_iterate(f, RAM_CONTROL_SETUP);
>
> - multifd_send_sync_main(*rsp);
> + multifd_send_sync_main(f);
> qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
> qemu_fflush(f);
>
> @@ -3526,7 +3526,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
> out:
> if (ret >= 0
> && migration_is_setup_or_active(migrate_get_current()->state)) {
> - multifd_send_sync_main(rs);
> + multifd_send_sync_main(rs->f);
> qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
> qemu_fflush(f);
> ram_counters.transferred += 8;
> @@ -3585,7 +3585,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
> }
>
> if (ret >= 0) {
> - multifd_send_sync_main(rs);
> + multifd_send_sync_main(rs->f);
> qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
> qemu_fflush(f);
> }
> --
> 2.24.1
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- Re: [PATCH v3 08/21] migration: Make multifd_load_setup() get an Error parameter, (continued)
- [PATCH v3 10/21] ram_addr: Split RAMBlock definition, Juan Quintela, 2020/01/23
- [PATCH v3 09/21] migration: Add multifd-compress parameter, Juan Quintela, 2020/01/23
- [PATCH v3 11/21] multifd: multifd_send_pages only needs the qemufile, Juan Quintela, 2020/01/23
- [PATCH v3 12/21] multifd: multifd_queue_page only needs the qemufile, Juan Quintela, 2020/01/23
- [PATCH v3 13/21] multifd: multifd_send_sync_main only needs the qemufile, Juan Quintela, 2020/01/23
- Re: [PATCH v3 13/21] multifd: multifd_send_sync_main only needs the qemufile,
Dr. David Alan Gilbert <=
- [PATCH v3 14/21] multifd: Use qemu_target_page_size(), Juan Quintela, 2020/01/23
- [PATCH v3 15/21] migration: Make checkpatch happy with comments, Juan Quintela, 2020/01/23
- [PATCH v3 16/21] migration: Add support for modules, Juan Quintela, 2020/01/23
- [PATCH v3 18/21] migration: Make no compression operations into its own structure, Juan Quintela, 2020/01/23