[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 11/21] multifd: multifd_send_pages only needs the qemufile
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [PATCH v3 11/21] multifd: multifd_send_pages only needs the qemufile |
Date: |
Fri, 24 Jan 2020 10:57:33 +0000 |
User-agent: |
Mutt/1.13.0 (2019-11-30) |
* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>
OK, although this is a side effect of multifd_send_state being a global
rather than part of RAMState which might have been cleaner.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
> ---
> migration/ram.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 125c6d0f60..19caf5ed4d 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -929,7 +929,7 @@ struct {
> * false.
> */
>
> -static int multifd_send_pages(RAMState *rs)
> +static int multifd_send_pages(QEMUFile *f)
> {
> int i;
> static int next_channel;
> @@ -965,7 +965,7 @@ static int multifd_send_pages(RAMState *rs)
> multifd_send_state->pages = p->pages;
> p->pages = pages;
> transferred = ((uint64_t) pages->used) * TARGET_PAGE_SIZE +
> p->packet_len;
> - qemu_file_update_transfer(rs->f, transferred);
> + qemu_file_update_transfer(f, transferred);
> ram_counters.multifd_bytes += transferred;
> ram_counters.transferred += transferred;;
> qemu_mutex_unlock(&p->mutex);
> @@ -993,7 +993,7 @@ static int multifd_queue_page(RAMState *rs, RAMBlock
> *block, ram_addr_t offset)
> }
> }
>
> - if (multifd_send_pages(rs) < 0) {
> + if (multifd_send_pages(rs->f) < 0) {
> return -1;
> }
>
> @@ -1090,7 +1090,7 @@ static void multifd_send_sync_main(RAMState *rs)
> return;
> }
> if (multifd_send_state->pages->used) {
> - if (multifd_send_pages(rs) < 0) {
> + if (multifd_send_pages(rs->f) < 0) {
> error_report("%s: multifd_send_pages fail", __func__);
> return;
> }
> --
> 2.24.1
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- Re: [PATCH v3 06/21] migration: Don't send data if we have stopped, (continued)
- [PATCH v3 07/21] migration: Make multifd_save_setup() get an Error parameter, Juan Quintela, 2020/01/23
- [PATCH v3 08/21] migration: Make multifd_load_setup() get an Error parameter, Juan Quintela, 2020/01/23
- [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
- Re: [PATCH v3 11/21] multifd: multifd_send_pages only needs the qemufile,
Dr. David Alan Gilbert <=
- [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
- [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