From: Laurent Vivier <lvivier@redhat.com>
To: Peter Xu <peterx@redhat.com>, Juan Quintela <quintela@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] migration: fix incorrect enable return path
Date: Mon, 19 Jun 2017 13:12:36 +0200 [thread overview]
Message-ID: <a386f13f-2a82-b84f-b17f-ff28dcad561c@redhat.com> (raw)
In-Reply-To: <786c6bcf-2b85-1faa-bc70-66cbe404cbfa@redhat.com>
On 15/06/2017 18:54, Laurent Vivier wrote:
> On 14/06/2017 09:55, Peter Xu wrote:
>> 0425dc9 is actually v1 of that patch, but it was accidentally
>> merged (while there was a v2). That will cause problem when we try to
>> migrate to some old QEMUs when return path is not really there. Let's
>> fix it, then squashing this patch with 0425dc9 will be exactly patch
>> content of v2.
>>
>> Fixes: 0425dc9 ("migration: isolate return path on src")
>> Signed-off-by: Peter Xu <peterx@redhat.com>
>> ---
>> migration/migration.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/migration/migration.c b/migration/migration.c
>> index 8ef6d6c..f9053b0 100644
>> --- a/migration/migration.c
>> +++ b/migration/migration.c
>> @@ -1814,7 +1814,11 @@ static void *migration_thread(void *opaque)
>>
>> qemu_savevm_state_header(s->to_dst_file);
>>
>> - if (s->to_dst_file) {
>> + /*
>> + * If we opened the return path, we need to make sure dst has it
>> + * opened as well.
>> + */
>> + if (s->rp_state.from_dst_file) {
>> /* Now tell the dest that it should open its end so it can reply */
>> qemu_savevm_send_open_return_path(s->to_dst_file);
>>
>>
>
> Tested-by: Laurent Vivier <lvivier@redhat.com>
>
> This also fixes migration of pseries guest, using the same
> binary/machine type on both side, the error was:
>
> qemu-system-ppc64: Failed to load spapr_iommu:mig_table
> qemu-system-ppc64: error while loading state for instance 0x80000001 of
> device 'spapr_iommu'
> qemu-system-ppc64: load of migration failed: Input/output error
The error is an IEO because the file descriptor is closed on source. It
seems the source closes the stream too early without this patch.
For test purpose, I have disabled the qemu_fclose() on the source, and
the error disappears from the destination.
Laurent
next prev parent reply other threads:[~2017-06-19 11:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-14 7:55 [Qemu-devel] [PATCH] migration: fix incorrect enable return path Peter Xu
2017-06-14 8:31 ` Dr. David Alan Gilbert
2017-06-14 8:35 ` no-reply
2017-06-14 8:55 ` Juan Quintela
2017-06-15 16:54 ` Laurent Vivier
2017-06-19 11:12 ` Laurent Vivier [this message]
2017-06-21 9:31 ` Peter Xu
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=a386f13f-2a82-b84f-b17f-ff28dcad561c@redhat.com \
--to=lvivier@redhat.com \
--cc=dgilbert@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).