The following changes since commit 1ae4271ab8dbfbf5dc28b36baa7f3fd5fd2215e1:

  Merge tag 'pull-11.0-virtio-gpu-updates-060326-1' of https://gitlab.com/stsquad/qemu into staging (2026-03-07 11:22:16 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 161e6039759a77debee9434ee55a086c8a85ed60:

  colo: Reuse the return path from migration on primary and secondary side (2026-03-09 08:53:34 -0300)

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

- Fix for races when migration starts again after a failure
- New maintainer for COLO: Lukas Straub
- COLO cleanups and bug fixes
- COLO multifd support

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

Lukas Straub (21):
  MAINTAINERS: Add myself as maintainer for COLO migration framework
  MAINTAINERS: Remove Hailiang Zhang from COLO migration framework
  colo: Setup ram cache in normal migration path
  colo: Replace migration_incoming_colo_enabled() with migrate_colo()
  colo: Remove ENABLE_COLO savevm command and mark it as deprecated
  ram: Remove colo special-casing
  multifd: Move ram state receive into multifd_ram_state_recv()
  multifd: Add COLO support
  Call colo_release_ram_cache() after multifd threads terminate
  colo: Fix crash during device vmstate load
  colo: Hold the BQL while sending ram state
  colo: Do not hold the BQL while receiving ram state.
  migration-test: Add COLO migration unit test
  Convert colo main documentation to restructuredText
  qemu-colo.rst: Miscellaneous changes
  qemu-colo.rst: Add my copyright
  qemu-colo.rst: Simplify the block replication setup
  multifd: Fix hang if send thread errors during sync
  colo: Use file lock in primary_vm_do_failover()
  migration: Keep s->rp_state.from_dst_file open until migration ends
  colo: Reuse the return path from migration on primary and secondary
    side

Prasad J Pandit (1):
  migration: introduce MIGRATION_STATUS_FAILING

 MAINTAINERS                           |   6 +-
 docs/COLO-FT.txt                      | 334 ------------------------
 docs/system/index.rst                 |   1 +
 docs/system/qemu-colo.rst             | 361 ++++++++++++++++++++++++++
 include/migration/colo.h              |   3 -
 migration/colo.c                      |  59 ++---
 migration/meson.build                 |   2 +-
 migration/migration.c                 | 112 ++++----
 migration/multifd-colo.c              |  41 +++
 migration/multifd-colo.h              |  23 ++
 migration/multifd-nocomp.c            |  10 +-
 migration/multifd.c                   |  30 ++-
 migration/multifd.h                   |   5 +-
 migration/options.c                   |  10 +-
 migration/ram.c                       |  12 +-
 migration/savevm.c                    |  37 +--
 migration/savevm.h                    |   1 -
 migration/trace-events                |   1 -
 qapi/migration.json                   |   9 +-
 tests/qtest/meson.build               |   7 +-
 tests/qtest/migration-test.c          |   1 +
 tests/qtest/migration/colo-tests.c    | 195 ++++++++++++++
 tests/qtest/migration/framework.c     |  13 +
 tests/qtest/migration/framework.h     |   5 +
 tests/qtest/migration/migration-qmp.c |   3 +-
 tests/qtest/migration/precopy-tests.c |   3 +-
 26 files changed, 798 insertions(+), 486 deletions(-)
 delete mode 100644 docs/COLO-FT.txt
 create mode 100644 docs/system/qemu-colo.rst
 create mode 100644 migration/multifd-colo.c
 create mode 100644 migration/multifd-colo.h
 create mode 100644 tests/qtest/migration/colo-tests.c

-- 
2.51.0

On Mon, 9 Mar 2026 at 13:08, Fabiano Rosas <farosas@suse.de> wrote:
>
> The following changes since commit 1ae4271ab8dbfbf5dc28b36baa7f3fd5fd2215e1:
>
>   Merge tag 'pull-11.0-virtio-gpu-updates-060326-1' of https://gitlab.com/stsquad/qemu into staging (2026-03-07 11:22:16 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/farosas/qemu.git tags/migration-20260309-pull-request
>
> for you to fetch changes up to 161e6039759a77debee9434ee55a086c8a85ed60:
>
>   colo: Reuse the return path from migration on primary and secondary side (2026-03-09 08:53:34 -0300)
>
> ----------------------------------------------------------------
> Migration pull request
>
> - Fix for races when migration starts again after a failure
> - New maintainer for COLO: Lukas Straub
> - COLO cleanups and bug fixes
> - COLO multifd support
>



Applied, thanks.

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

-- PMM