From: Peter Xu <peterx@redhat.com>

The following changes since commit 158a054c4d1a40179f5e83cd7e1cfe65de457b92:

  Merge tag 'pull-target-arm-20240227-1' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2024-02-27 15:34:41 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 9425ef3f990a42b98329d5059362f40714e70442:

  migration: Use migrate_has_error() in close_return_path_on_source() (2024-02-28 11:31:28 +0800)

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

- Fabiano's fixed-ram patches (1-5 only)
- Peter's cleanups on multifd tls IOC referencing
- Steve's cpr patches for vfio (migration patches only)
- Fabiano's fix on mbps stats racing with COMPLETE state
- Fabiano's fix on return path thread hang

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

Cédric Le Goater (1):
  migration: Use migrate_has_error() in close_return_path_on_source()

Fabiano Rosas (7):
  docs/devel/migration.rst: Document the file transport
  tests/qtest/migration: Rename fd_proto test
  tests/qtest/migration: Add a fd + file test
  migration/multifd: Remove p->quit from recv side
  migration/multifd: Release recv sem_sync earlier
  migration: Fix qmp_query_migrate mbps value
  migration: Join the return path thread before releasing to_dst_file

Peter Xu (5):
  migration/multifd: Cleanup TLS iochannel referencing
  migration/multifd: Drop registered_yank
  migration/multifd: Make multifd_channel_connect() return void
  migration/multifd: Cleanup outgoing_args in state destroy
  migration/multifd: Drop unnecessary helper to destroy IOC

Steve Sistare (12):
  notify: pass error to notifier with return
  migration: remove error from notifier data
  migration: convert to NotifierWithReturn
  migration: MigrationEvent for notifiers
  migration: remove postcopy_after_devices
  migration: MigrationNotifyFunc
  migration: per-mode notifiers
  migration: refactor migrate_fd_connect failures
  migration: notifier error checking
  migration: stop vm for cpr
  migration: update cpr-reboot description
  migration: options incompatible with cpr

 docs/devel/migration/main.rst  |   4 +
 qapi/migration.json            |  37 ++++---
 include/hw/vfio/vfio-common.h  |   2 +-
 include/hw/virtio/virtio-net.h |   2 +-
 include/migration/misc.h       |  47 +++++++-
 include/qemu/notify.h          |   8 +-
 migration/migration.h          |   4 -
 migration/multifd.h            |   2 -
 migration/postcopy-ram.h       |   1 -
 migration/socket.h             |   3 +-
 hw/net/virtio-net.c            |  13 ++-
 hw/vfio/migration.c            |  13 +--
 hw/virtio/vhost-user.c         |  10 +-
 hw/virtio/virtio-balloon.c     |   3 +-
 migration/migration.c          | 196 +++++++++++++++++++++------------
 migration/multifd.c            | 111 ++++++++++---------
 migration/postcopy-ram.c       |   3 +-
 migration/ram.c                |   3 +-
 migration/socket.c             |  19 ++--
 net/vhost-vdpa.c               |  14 +--
 tests/qtest/migration-test.c   |  46 +++++++-
 ui/spice-core.c                |  17 ++-
 util/notify.c                  |   5 +-
 hw/vfio/trace-events           |   2 +-
 24 files changed, 354 insertions(+), 211 deletions(-)

-- 
2.43.0

On Wed, 28 Feb 2024 at 05:13, <peterx@redhat.com> wrote:
>
> From: Peter Xu <peterx@redhat.com>
>
> The following changes since commit 158a054c4d1a40179f5e83cd7e1cfe65de457b92:
>
>   Merge tag 'pull-target-arm-20240227-1' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2024-02-27 15:34:41 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/peterx/qemu.git tags/migration-next-pull-request
>
> for you to fetch changes up to 9425ef3f990a42b98329d5059362f40714e70442:
>
>   migration: Use migrate_has_error() in close_return_path_on_source() (2024-02-28 11:31:28 +0800)
>
> ----------------------------------------------------------------
> Migration pull request
>
> - Fabiano's fixed-ram patches (1-5 only)
> - Peter's cleanups on multifd tls IOC referencing
> - Steve's cpr patches for vfio (migration patches only)
> - Fabiano's fix on mbps stats racing with COMPLETE state
> - Fabiano's fix on return path thread hang
>


Applied, thanks.

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

-- PMM