The 1st patch should fix yank with unregister instance; I think it should also
fix the issue that Leonardo used to fix in this patch:

https://lore.kernel.org/qemu-devel/20210629050522.147057-1-leobras@redhat.com/

The 2nd patch fixes postcopy recovery cannot retry if e.g. the 1st attempt
provided a wrong port address.

Note that the multifd zstd test may fail if run migration-test with sudo on
master (which seems to be a known issue now), and it'll still fail after these
two patches applied, however all running tests keep usual.

(Leo: please let me know if this series didn't fix the issue you used to fix)

Please review, thanks.

Peter Xu (2):
  migration: Move yank outside qemu_start_incoming_migration()
  migration: Allow reset of postcopy_recover_triggered when failed

 migration/migration.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

-- 
2.31.1

On Tue, Jun 29, 2021 at 02:13:54PM -0400, Peter Xu wrote:
> Note that the multifd zstd test may fail if run migration-test with sudo on
> master (which seems to be a known issue now), and it'll still fail after these
> two patches applied, however all running tests keep usual.

There's an unexpected accident; please ignore this paragraph as zstd test
actually passes with/without the patchset applied.

-- 
Peter Xu

On Tue, Jun 29, 2021 at 3:14 PM Peter Xu <peterx@redhat.com> wrote:
>
> The 1st patch should fix yank with unregister instance; I think it should also
> fix the issue that Leonardo used to fix in this patch:
>
> https://lore.kernel.org/qemu-devel/20210629050522.147057-1-leobras@redhat.com/
>
> The 2nd patch fixes postcopy recovery cannot retry if e.g. the 1st attempt
> provided a wrong port address.
>
> Note that the multifd zstd test may fail if run migration-test with sudo on
> master (which seems to be a known issue now), and it'll still fail after these
> two patches applied, however all running tests keep usual.
>
> (Leo: please let me know if this series didn't fix the issue you used to fix)

It does fix the issue, as far as I tested.

>
> Please review, thanks.
>
> Peter Xu (2):
>   migration: Move yank outside qemu_start_incoming_migration()
>   migration: Allow reset of postcopy_recover_triggered when failed
>
>  migration/migration.c | 24 ++++++++++++++++++------
>  1 file changed, 18 insertions(+), 6 deletions(-)
>
> --
> 2.31.1
>
>

On Tue, Jun 29, 2021 at 07:38:32PM -0300, Leonardo Bras Soares Passos wrote:
> > (Leo: please let me know if this series didn't fix the issue you used to fix)
> 
> It does fix the issue, as far as I tested.

Thanks, Leo!

-- 
Peter Xu