The following changes since commit 02d9c38236cf8c9826e5c5be61780c4444cb4ae0:

  Merge tag 'pull-tcg-20240619' of https://gitlab.com/rth7680/qemu into staging (2024-06-19 14:00:39 -0700)

are available in the Git repository at:

  https://gitlab.com/farosas/qemu.git tags/migration-20240621-pull-request

for you to fetch changes up to 04b09de16d78cf2d163ca65d7c6d161bf2baceb6:

  migration: Remove unused VMSTATE_ARRAY_TEST() macro (2024-06-21 14:37:58 -0300)

----------------------------------------------------------------
Migration pull request

- Fabiano's fix for fdset + file migration truncating the migration
  file

- Fabiano's fdset + direct-io support for mapped-ram

- Peter's various cleanups (multifd sync, thread names, migration
  states, tests)

- Peter's new migration state postcopy-recover-setup

- Philippe's unused vmstate macro cleanup

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

Fabiano Rosas (15):
  migration: Drop reference to QIOChannel if file seeking fails
  migration: Fix file migration with fdset
  tests/qtest/migration: Fix file migration offset check
  tests/qtest/migration: Add a precopy file test with fdset
  monitor: Introduce monitor_fdset_*free
  monitor: Stop removing non-duplicated fds
  monitor: Simplify fdset and fd removal
  monitor: Report errors from monitor_fdset_dup_fd_add
  io: Stop using qemu_open_old in channel-file
  migration: Add direct-io parameter
  migration/multifd: Add direct-io support
  tests/qtest/migration: Add tests for file migration with direct-io
  monitor: fdset: Match against O_DIRECT
  migration: Add documentation for fdset with multifd + file
  tests/qtest/migration: Add a test for mapped-ram with passing of fds

Peter Xu (12):
  monitor: Drop monitor_fdset_dup_fd_find/_remove()
  migration/multifd: Avoid the final FLUSH in complete()
  migration: Rename thread debug names
  migration: Use MigrationStatus instead of int
  migration: Cleanup incoming migration setup state change
  migration/postcopy: Add postcopy-recover-setup phase
  migration/docs: Update postcopy recover session for SETUP phase
  tests/migration-tests: Drop most WIN32 ifdefs for postcopy failure
    tests
  tests/migration-tests: Always enable migration events
  tests/migration-tests: migration_event_wait()
  tests/migration-tests: Verify postcopy-recover-setup status
  tests/migration-tests: Cover postcopy failure on reconnect

Philippe Mathieu-Daudé (1):
  migration: Remove unused VMSTATE_ARRAY_TEST() macro

 docs/devel/migration/main.rst       |  24 +-
 docs/devel/migration/mapped-ram.rst |   6 +-
 docs/devel/migration/postcopy.rst   |  29 +-
 include/migration/vmstate.h         |  10 -
 include/monitor/monitor.h           |   3 +-
 include/qemu/osdep.h                |   2 +
 io/channel-file.c                   |   8 +-
 migration/colo.c                    |   2 +-
 migration/file.c                    |  45 ++-
 migration/file.h                    |   1 -
 migration/migration-hmp-cmds.c      |  11 +
 migration/migration.c               | 121 +++++--
 migration/migration.h               |   9 +-
 migration/multifd.c                 |   6 +-
 migration/options.c                 |  35 +++
 migration/options.h                 |   1 +
 migration/postcopy-ram.c            |  10 +-
 migration/postcopy-ram.h            |   3 +
 migration/ram.c                     |   4 -
 migration/savevm.c                  |   6 +-
 monitor/fds.c                       |  96 +++---
 monitor/hmp.c                       |   2 -
 monitor/monitor-internal.h          |   1 -
 monitor/monitor.c                   |   1 -
 monitor/qmp.c                       |   2 -
 qapi/migration.json                 |  25 +-
 stubs/fdset.c                       |   7 +-
 tests/qtest/libqtest.c              |  15 +-
 tests/qtest/libqtest.h              |   2 +
 tests/qtest/migration-helpers.c     |  76 ++++-
 tests/qtest/migration-helpers.h     |  10 +
 tests/qtest/migration-test.c        | 470 +++++++++++++++++++++++++---
 util/osdep.c                        |  34 +-
 33 files changed, 838 insertions(+), 239 deletions(-)

-- 
2.35.3

On 6/21/24 10:54, Fabiano Rosas wrote:
> The following changes since commit 02d9c38236cf8c9826e5c5be61780c4444cb4ae0:
> 
>    Merge tag 'pull-tcg-20240619' ofhttps://gitlab.com/rth7680/qemu  into staging (2024-06-19 14:00:39 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/farosas/qemu.git  tags/migration-20240621-pull-request
> 
> for you to fetch changes up to 04b09de16d78cf2d163ca65d7c6d161bf2baceb6:
> 
>    migration: Remove unused VMSTATE_ARRAY_TEST() macro (2024-06-21 14:37:58 -0300)
> 
> ----------------------------------------------------------------
> Migration pull request
> 
> - Fabiano's fix for fdset + file migration truncating the migration
>    file
> 
> - Fabiano's fdset + direct-io support for mapped-ram
> 
> - Peter's various cleanups (multifd sync, thread names, migration
>    states, tests)
> 
> - Peter's new migration state postcopy-recover-setup
> 
> - Philippe's unused vmstate macro cleanup

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.


r~