From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Juan Quintela <quintela@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Thomas Huth <thuth@redhat.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH v4 6/6] migration: Don't send data if we have stopped
Date: Thu, 23 Jan 2020 16:49:56 +0000 [thread overview]
Message-ID: <20200123164956.GE2732@work-vm> (raw)
In-Reply-To: <20200122111517.33223-7-quintela@redhat.com>
* Juan Quintela (quintela@redhat.com) 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 <quintela@redhat.com>
OK.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> 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 / dgilbert@redhat.com / Manchester, UK
prev parent reply other threads:[~2020-01-23 19:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 11:15 [PATCH v4 0/6] Fix multifd + cancel + multifd Juan Quintela
2020-01-22 11:15 ` [PATCH v4 1/6] migration-test: Use g_free() instead of free() Juan Quintela
2020-01-22 12:40 ` Thomas Huth
2020-01-22 14:34 ` Philippe Mathieu-Daudé
2020-01-22 11:15 ` [PATCH v4 2/6] multifd: Make sure that we don't do any IO after an error Juan Quintela
2020-01-22 11:15 ` [PATCH v4 3/6] qemu-file: Don't do IO after shutdown Juan Quintela
2020-01-22 11:15 ` [PATCH v4 4/6] migration-test: Make sure that multifd and cancel works Juan Quintela
2021-04-30 22:57 ` Peter Maydell
2021-05-04 9:41 ` Dr. David Alan Gilbert
2020-01-22 11:15 ` [PATCH v4 5/6] migration: Create migration_is_running() Juan Quintela
2020-01-23 16:37 ` Dr. David Alan Gilbert
2020-01-22 11:15 ` [PATCH v4 6/6] migration: Don't send data if we have stopped Juan Quintela
2020-01-23 16:49 ` Dr. David Alan Gilbert [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200123164956.GE2732@work-vm \
--to=dgilbert@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.