From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 9 Mar 2026 14:53:34 +0000 (+0000)
Subject: Merge tag 'migration-20260309-pull-request' of https://gitlab.com/farosas/qemu into... 
X-Git-Tag: v11.0.0-rc0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=801797c2491b4e6bad16bb93b49def1fdec4cb5d;p=thirdparty%2Fqemu.git

Merge tag 'migration-20260309-pull-request' of https://gitlab.com/farosas/qemu into staging

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

# -----BEGIN PGP SIGNATURE-----
#
# iQJEBAABCAAuFiEEqhtIsKIjJqWkw2TPx5jcdBvsMZ0FAmmuwz8QHGZhcm9zYXNA
# c3VzZS5kZQAKCRDHmNx0G+wxnaQ4D/9dq5niCFuJvP5xhaYTc0+VCErlaR9SFPkd
# OuJI3CWlld4EEfzgo0wAnt2CdF2oRqZwRrDzkcp0pXEaRS0US2yrzcnrXZmJwZ4j
# ZwTyMd/8N6Ej+qAzAkEFzT7pnwQDSWjtjLG+FZx8fidMqyYtEi2b4Ycp2x3VwZ+6
# BbR73sVK+4BNRR3OzI2FykmR6zlQgkWhznrHwpseYFJTmz28q/U3sIB0OA80lnuT
# DvZFlmwUSfJj+3hCrIcIm19SktOAG/8/jgkdMcWfb/EgBMieDBhLW0Q8S+EPVqNe
# HlcsZ3uYs8FFU/ae8j5TBeRHk4G41sUtFgunW6JD2Lgez+BAENejm3YbTtj8OyKA
# 95hYyCLa+GdYcTAHLBHU3xKhtrzcLQ7guDpeJqWPg36zKwBsZgBEDYqwQ/TTaMNR
# qLjRGZ3+h7HSrcIlDfE3HqZxAvsbGszQ8LlEeKxfrO+RklYSrQR1lEoeKZc9DYU3
# taAvWKYHkNGmOR6th6MQlT4eQGDkXxBv2oyLjlujS63102OrsSjFRwkuCwq0JNZk
# xcpw+EeUQAG6srOJHhe0HbjlhYSee26U0GuTrO3rlhqkKY+I10X81fCLhkUflnrA
# sjIjwRnI9uRUIOKuSx/XWVAvN1SW+/TYpDUPFon457RFjyQM7dirpyvxTcD5QTwj
# 1froPBPq8Q==
# =smC6
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Mar  9 12:55:27 2026 GMT
# gpg:                using RSA key AA1B48B0A22326A5A4C364CFC798DC741BEC319D
# gpg:                issuer "farosas@suse.de"
# gpg: Good signature from "Fabiano Rosas <farosas@suse.de>" [unknown]
# gpg:                 aka "Fabiano Almeida Rosas <fabiano.rosas@suse.com>" [unknown]
# gpg: WARNING: The key's User ID is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: AA1B 48B0 A223 26A5 A4C3  64CF C798 DC74 1BEC 319D

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

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

801797c2491b4e6bad16bb93b49def1fdec4cb5d