[v1] Migration 20240917 patches

[PULL 0/6] Migration 20240917 patches

Posted by Peter Xu 1 year, 2 months ago

The following changes since commit 2b81c046252fbfb375ad30632362fc16e6e22bd5:

  Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2024-09-17 14:02:18 +0100)

are available in the Git repository at:

  https://gitlab.com/peterx/qemu.git tags/migration-20240917-pull-request

for you to fetch changes up to 7b8b4c0e59d2b7928836072536a5528820d8a041:

  migration/multifd: Fix rb->receivedmap cleanup race (2024-09-17 17:50:45 -0400)

----------------------------------------------------------------
Migration pull for 9.2

- Fabiano's patch to move two tests to slow tests.
- Peter's patch to fix qatzip builds
- Stefan's multifd-zstd fix on unsigned diff comparisons
- Fea's bug fix to consistently use memattrs when map() address space
- Fabiano's bug fix on multifd race condition against receivedmap

----------------------------------------------------------------

Fabiano Rosas (3):
  tests/qtest/migration: Move a couple of slow tests under g_test_slow
  migration/savevm: Remove extra load cleanup calls
  migration/multifd: Fix rb->receivedmap cleanup race

Fea.Wang (1):
  softmmu/physmem.c: Keep transaction attribute in address_space_map()

Peter Xu (1):
  migration/multifd: Fix build for qatzip

Stefan Weil (1):
  migration/multifd: Fix loop conditions in multifd_zstd_send_prepare
    and multifd_zstd_recv

 migration/migration.c        |  5 +++++
 migration/multifd-qatzip.c   | 18 +++++++++---------
 migration/multifd-zstd.c     |  8 ++++----
 migration/savevm.c           |  8 ++++----
 system/physmem.c             |  2 +-
 tests/qtest/migration-test.c |  8 +++++---
 6 files changed, 28 insertions(+), 21 deletions(-)

-- 
2.45.0

Re: [PULL 0/6] Migration 20240917 patches

Posted by Peter Maydell 1 year, 2 months ago

On Tue, 17 Sept 2024 at 22:56, Peter Xu <peterx@redhat.com> wrote:
>
> The following changes since commit 2b81c046252fbfb375ad30632362fc16e6e22bd5:
>
>   Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2024-09-17 14:02:18 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/peterx/qemu.git tags/migration-20240917-pull-request
>
> for you to fetch changes up to 7b8b4c0e59d2b7928836072536a5528820d8a041:
>
>   migration/multifd: Fix rb->receivedmap cleanup race (2024-09-17 17:50:45 -0400)
>
> ----------------------------------------------------------------
> Migration pull for 9.2
>
> - Fabiano's patch to move two tests to slow tests.
> - Peter's patch to fix qatzip builds
> - Stefan's multifd-zstd fix on unsigned diff comparisons
> - Fea's bug fix to consistently use memattrs when map() address space
> - Fabiano's bug fix on multifd race condition against receivedmap
>
> ----------------------------------------------------------------
>
> Fabiano Rosas (3):
>   tests/qtest/migration: Move a couple of slow tests under g_test_slow
>   migration/savevm: Remove extra load cleanup calls
>   migration/multifd: Fix rb->receivedmap cleanup race
>
> Fea.Wang (1):
>   softmmu/physmem.c: Keep transaction attribute in address_space_map()
>
> Peter Xu (1):
>   migration/multifd: Fix build for qatzip
>
> Stefan Weil (1):
>   migration/multifd: Fix loop conditions in multifd_zstd_send_prepare
>     and multifd_zstd_recv

ERROR: pull request includes commits attributed to list

specifically:
commit ebb47ddce00a1d681124f2e248022a0a5310daa8
Author: Stefan Weil via <qemu-devel@nongnu.org>
migration/multifd: Fix loop conditions in multifd_zstd_send_prepare
and multifd_zstd_recv

(git log --no-mailmap will show you this. The check in my scripting
that catches it is:
if git shortlog --author='qemu-.*@nongnu\.org' master..staging | grep .; then
    echo "ERROR: pull request includes commits attributed to list"
    exit 1
fi

if you want to automate finding it.)

Can you fix this and resend, please?

thanks
-- PMM

Re: [PULL 0/6] Migration 20240917 patches

Posted by Peter Xu 1 year, 2 months ago

On Wed, Sep 18, 2024 at 06:53:31PM +0100, Peter Maydell wrote:
> On Tue, 17 Sept 2024 at 22:56, Peter Xu <peterx@redhat.com> wrote:
> >
> > The following changes since commit 2b81c046252fbfb375ad30632362fc16e6e22bd5:
> >
> >   Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2024-09-17 14:02:18 +0100)
> >
> > are available in the Git repository at:
> >
> >   https://gitlab.com/peterx/qemu.git tags/migration-20240917-pull-request
> >
> > for you to fetch changes up to 7b8b4c0e59d2b7928836072536a5528820d8a041:
> >
> >   migration/multifd: Fix rb->receivedmap cleanup race (2024-09-17 17:50:45 -0400)
> >
> > ----------------------------------------------------------------
> > Migration pull for 9.2
> >
> > - Fabiano's patch to move two tests to slow tests.
> > - Peter's patch to fix qatzip builds
> > - Stefan's multifd-zstd fix on unsigned diff comparisons
> > - Fea's bug fix to consistently use memattrs when map() address space
> > - Fabiano's bug fix on multifd race condition against receivedmap
> >
> > ----------------------------------------------------------------
> >
> > Fabiano Rosas (3):
> >   tests/qtest/migration: Move a couple of slow tests under g_test_slow
> >   migration/savevm: Remove extra load cleanup calls
> >   migration/multifd: Fix rb->receivedmap cleanup race
> >
> > Fea.Wang (1):
> >   softmmu/physmem.c: Keep transaction attribute in address_space_map()
> >
> > Peter Xu (1):
> >   migration/multifd: Fix build for qatzip
> >
> > Stefan Weil (1):
> >   migration/multifd: Fix loop conditions in multifd_zstd_send_prepare
> >     and multifd_zstd_recv
> 
> ERROR: pull request includes commits attributed to list
> 
> specifically:
> commit ebb47ddce00a1d681124f2e248022a0a5310daa8
> Author: Stefan Weil via <qemu-devel@nongnu.org>
> migration/multifd: Fix loop conditions in multifd_zstd_send_prepare
> and multifd_zstd_recv
> 
> (git log --no-mailmap will show you this. The check in my scripting
> that catches it is:
> if git shortlog --author='qemu-.*@nongnu\.org' master..staging | grep .; then
>     echo "ERROR: pull request includes commits attributed to list"
>     exit 1
> fi
> 
> if you want to automate finding it.)
> 
> Can you fix this and resend, please?

Yep, will resend, sorry for the noise.

-- 
Peter Xu