[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 6/6] migration: Don't send data if we have stopped
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [PATCH v4 6/6] migration: Don't send data if we have stopped |
Date: |
Thu, 23 Jan 2020 16:49:56 +0000 |
User-agent: |
Mutt/1.13.0 (2019-11-30) |
* Juan Quintela (address@hidden) wrote:
> If we do a cancel, we got out without one error, but we can't do the
> rest of the output as in a normal situation.
>
> Signed-off-by: Juan Quintela <address@hidden>
OK.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
> ---
> migration/ram.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index f95d656c26..3fd7fdffcf 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -3524,7 +3524,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
> ram_control_after_iterate(f, RAM_CONTROL_ROUND);
>
> out:
> - if (ret >= 0) {
> + if (ret >= 0
> + && migration_is_setup_or_active(migrate_get_current()->state)) {
> multifd_send_sync_main(rs);
> qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
> qemu_fflush(f);
> --
> 2.24.1
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [PATCH v4 0/6] Fix multifd + cancel + multifd, Juan Quintela, 2020/01/22
- [PATCH v4 2/6] multifd: Make sure that we don't do any IO after an error, Juan Quintela, 2020/01/22
- [PATCH v4 1/6] migration-test: Use g_free() instead of free(), Juan Quintela, 2020/01/22
- [PATCH v4 3/6] qemu-file: Don't do IO after shutdown, Juan Quintela, 2020/01/22
- [PATCH v4 4/6] migration-test: Make sure that multifd and cancel works, Juan Quintela, 2020/01/22
- [PATCH v4 5/6] migration: Create migration_is_running(), Juan Quintela, 2020/01/22
- [PATCH v4 6/6] migration: Don't send data if we have stopped, Juan Quintela, 2020/01/22
- Re: [PATCH v4 6/6] migration: Don't send data if we have stopped,
Dr. David Alan Gilbert <=