From: Peter Xu <peterx@redhat.com>

The following changes since commit 977542ded7e6b28d2bc077bcda24568c716e393c:

  Merge tag 'pull-testing-updates-120124-2' of https://gitlab.com/stsquad/qemu into staging (2024-01-12 14:02:53 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 44ce1b5d2fc77343f6a318cb3de613336a240048:

  migration/rdma: define htonll/ntohll only if not predefined (2024-01-16 11:16:10 +0800)

----------------------------------------------------------------
Migration pull request 2nd batch for 9.0

- Het's cleanup on migration qmp command paths
- Fabiano's migration cleanups and test improvements
- Fabiano's patch to re-enable multifd-cancel test
- Peter's migration doc reorganizations
- Nick Briggs's fix for Solaries build on rdma

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

Fabiano Rosas (8):
  migration/multifd: Remove MultiFDPages_t::packet_num
  migration/multifd: Remove QEMUFile from where it is not needed
  migration/multifd: Change multifd_pages_init argument
  migration: Report error in incoming migration
  tests/qtest/migration: Print migration incoming errors
  tests/qtest/migration: Add a wrapper to print test names
  tests/qtest/migration: Use the new migration_test_add
  tests/qtest: Re-enable multifd cancel test

Het Gala (1):
  migration: Simplify initial conditionals in migration for better
    readability

Nick Briggs (1):
  migration/rdma: define htonll/ntohll only if not predefined

Peter Xu (10):
  docs/migration: Create migration/ directory
  docs/migration: Create index page
  docs/migration: Convert virtio.txt into rST
  docs/migration: Split "Backwards compatibility" separately
  docs/migration: Split "Debugging" and "Firmware"
  docs/migration: Split "Postcopy"
  docs/migration: Split "dirty limit"
  docs/migration: Organize "Postcopy" page
  docs/migration: Further move vfio to be feature of migration
  docs/migration: Further move virtio to be feature of migration

 docs/devel/index-internals.rst                |    3 +-
 docs/devel/migration.rst                      | 1514 -----------------
 docs/devel/migration/best-practices.rst       |   48 +
 docs/devel/migration/compatibility.rst        |  517 ++++++
 docs/devel/migration/dirty-limit.rst          |   71 +
 docs/devel/migration/features.rst             |   12 +
 docs/devel/migration/index.rst                |   13 +
 docs/devel/migration/main.rst                 |  575 +++++++
 docs/devel/migration/postcopy.rst             |  313 ++++
 .../vfio.rst}                                 |    2 +-
 docs/devel/migration/virtio.rst               |  115 ++
 docs/devel/virtio-migration.txt               |  108 --
 migration/multifd.h                           |    6 +-
 tests/qtest/migration-helpers.h               |    1 +
 migration/migration.c                         |   43 +-
 migration/multifd.c                           |   19 +-
 migration/ram.c                               |   15 +-
 migration/rdma.c                              |    4 +
 tests/qtest/migration-helpers.c               |   38 +
 tests/qtest/migration-test.c                  |  219 +--
 20 files changed, 1861 insertions(+), 1775 deletions(-)
 delete mode 100644 docs/devel/migration.rst
 create mode 100644 docs/devel/migration/best-practices.rst
 create mode 100644 docs/devel/migration/compatibility.rst
 create mode 100644 docs/devel/migration/dirty-limit.rst
 create mode 100644 docs/devel/migration/features.rst
 create mode 100644 docs/devel/migration/index.rst
 create mode 100644 docs/devel/migration/main.rst
 create mode 100644 docs/devel/migration/postcopy.rst
 rename docs/devel/{vfio-migration.rst => migration/vfio.rst} (99%)
 create mode 100644 docs/devel/migration/virtio.rst
 delete mode 100644 docs/devel/virtio-migration.txt

-- 
2.43.0

On Tue, 16 Jan 2024 at 03:19, <peterx@redhat.com> wrote:
>
> From: Peter Xu <peterx@redhat.com>
>
> The following changes since commit 977542ded7e6b28d2bc077bcda24568c716e393c:
>
>   Merge tag 'pull-testing-updates-120124-2' of https://gitlab.com/stsquad/qemu into staging (2024-01-12 14:02:53 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/peterx/qemu.git tags/migration-20240116-pull-request
>
> for you to fetch changes up to 44ce1b5d2fc77343f6a318cb3de613336a240048:
>
>   migration/rdma: define htonll/ntohll only if not predefined (2024-01-16 11:16:10 +0800)
>
> ----------------------------------------------------------------
> Migration pull request 2nd batch for 9.0
>
> - Het's cleanup on migration qmp command paths
> - Fabiano's migration cleanups and test improvements
> - Fabiano's patch to re-enable multifd-cancel test
> - Peter's migration doc reorganizations
> - Nick Briggs's fix for Solaries build on rdma
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM