The following changes since commit 266ccbb27b3ec6661f22395ec2c41d854c94d761:

  Merge tag 'pull-target-arm-20230518' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-05-18 06:08:30 -0700)

are available in the Git repository at:

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

for you to fetch changes up to ba9d2cbc01b4e33f9a97edcd77247831a333eac2:

  migration: Fix duplicated included in meson.build (2023-05-18 18:41:53 +0200)

----------------------------------------------------------------
Migration Pull request

Hi

Based on latest reviewed parts of migration:
- Disable colo (vladimir)
- Migration atomic counters (juan)

Please apply.

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

Juan Quintela (9):
  migration: Don't use INT64_MAX for unlimited rate
  qemu-file: Account for rate_limit usage on qemu_fflush()
  migration: Move rate_limit_max and rate_limit_used to migration_stats
  migration: Move migration_total_bytes() to migration-stats.c
  migration: Add a trace for migration_transferred_bytes
  migration: Use migration_transferred_bytes() to calculate rate_limit
  migration: We don't need the field rate_limit_used anymore
  migration/multifd: Compute transferred bytes correctly
  migration: Fix duplicated included in meson.build

Vladimir Sementsov-Ogievskiy (3):
  configure: add --disable-colo-proxy option
  migration: split migration_incoming_co
  migration: process_incoming_migration_co(): move colo part to colo

 include/migration/colo.h            |  9 ++++-
 include/migration/qemu-file-types.h | 12 +++++-
 migration/migration-stats.h         | 55 ++++++++++++++++++++++++++++
 migration/migration.h               |  9 ++++-
 migration/options.h                 |  7 ----
 migration/qemu-file.h               | 11 ------
 hw/ppc/spapr.c                      |  4 +-
 hw/s390x/s390-stattrib.c            |  2 +-
 migration/block-dirty-bitmap.c      |  2 +-
 migration/block.c                   |  5 ++-
 migration/colo.c                    | 43 ++++++++++++++++++++--
 migration/migration-stats.c         | 51 ++++++++++++++++++++++++++
 migration/migration.c               | 57 ++++++++---------------------
 migration/multifd.c                 | 14 ++++---
 migration/options.c                 |  7 ++--
 migration/qemu-file.c               | 55 ++--------------------------
 migration/ram.c                     |  2 +-
 migration/rdma.c                    |  5 +--
 migration/savevm.c                  |  2 +-
 stubs/colo-compare.c                |  7 ++++
 stubs/colo.c                        |  6 +--
 meson_options.txt                   |  2 +
 migration/meson.build               |  3 +-
 migration/trace-events              |  3 ++
 net/meson.build                     | 13 +++++--
 scripts/meson-buildoptions.sh       |  3 ++
 stubs/meson.build                   |  1 +
 27 files changed, 242 insertions(+), 148 deletions(-)
 create mode 100644 stubs/colo-compare.c

-- 
2.40.1

On 5/18/23 10:12, Juan Quintela wrote:
> The following changes since commit 266ccbb27b3ec6661f22395ec2c41d854c94d761:
> 
>    Merge tag 'pull-target-arm-20230518' ofhttps://git.linaro.org/people/pmaydell/qemu-arm  into staging (2023-05-18 06:08:30 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/juan.quintela/qemu.git  tags/migration-20230518-pull-request
> 
> for you to fetch changes up to ba9d2cbc01b4e33f9a97edcd77247831a333eac2:
> 
>    migration: Fix duplicated included in meson.build (2023-05-18 18:41:53 +0200)
> 
> ----------------------------------------------------------------
> Migration Pull request
> 
> Hi
> 
> Based on latest reviewed parts of migration:
> - Disable colo (vladimir)
> - Migration atomic counters (juan)
> 
> Please apply.

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


r~