The following changes since commit caa9cbd566877b34e9abcc04d936116fc5e0ab28:

  Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging (2023-05-10 14:52:03 +0100)

are available in the Git repository at:

  https://gitlab.com/juan.quintela/qemu.git tags/migration-20230509-pull-request

for you to fetch changes up to 121ccedc2bf0c124e93991275336415d12d2e3df:

  migration: block incoming colo when capability is disabled (2023-05-10 18:48:12 +0200)

----------------------------------------------------------------
Migration Pull request (20230509 vintage) take 2

Hi

In this take 2:
- Change uint -> uint32_t to fix mingw32 compilation.

Please apply.
[take 1]
In this PULL request:
- 1st part of colo support for multifd (lukas)
- 1st part of disabling colo option (vladimir)

Please, apply.

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

Lukas Straub (3):
  ram: Add public helper to set colo bitmap
  ram: Let colo_flush_ram_cache take the bitmap_mutex
  multifd: Add the ramblock to MultiFDRecvParams

Vladimir Sementsov-Ogievskiy (7):
  block/meson.build: prefer positive condition for replication
  colo: make colo_checkpoint_notify static and provide simpler API
  build: move COLO under CONFIG_REPLICATION
  migration: drop colo_incoming_thread from MigrationIncomingState
  migration: process_incoming_migration_co: simplify code flow around
    ret
  migration: disallow change capabilities in COLO state
  migration: block incoming colo when capability is disabled

 docs/COLO-FT.txt               |  1 +
 qapi/migration.json            |  9 ++++--
 include/migration/colo.h       |  9 +++++-
 migration/migration.h          |  2 --
 migration/multifd.h            |  2 ++
 migration/ram.h                |  1 +
 migration/colo.c               | 57 +++++++++++-----------------------
 migration/migration-hmp-cmds.c |  2 ++
 migration/migration.c          | 35 ++++++++++++++-------
 migration/multifd.c            | 11 +++----
 migration/options.c            |  6 ++--
 migration/ram.c                | 19 ++++++++++--
 stubs/colo.c                   | 39 +++++++++++++++++++++++
 block/meson.build              |  2 +-
 hmp-commands.hx                |  2 ++
 migration/meson.build          |  6 ++--
 stubs/meson.build              |  1 +
 17 files changed, 131 insertions(+), 73 deletions(-)
 create mode 100644 stubs/colo.c

-- 
2.40.1

On 5/10/23 19:09, Juan Quintela wrote:
> The following changes since commit caa9cbd566877b34e9abcc04d936116fc5e0ab28:
> 
>    Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging (2023-05-10 14:52:03 +0100)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/juan.quintela/qemu.git tags/migration-20230509-pull-request
> 
> for you to fetch changes up to 121ccedc2bf0c124e93991275336415d12d2e3df:
> 
>    migration: block incoming colo when capability is disabled (2023-05-10 18:48:12 +0200)
> 
> ----------------------------------------------------------------
> Migration Pull request (20230509 vintage) take 2
> 
> Hi
> 
> In this take 2:
> - Change uint -> uint32_t to fix mingw32 compilation.
> 
> Please apply.
> [take 1]
> In this PULL request:
> - 1st part of colo support for multifd (lukas)
> - 1st part of disabling colo option (vladimir)
> 
> Please, apply.

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


r~