From: Richard Henderson <richard.henderson@linaro.org>
Date: Thu, 18 May 2023 18:07:06 +0000 (-0700)
Subject: Merge tag 'migration-20230518-pull-request' of https://gitlab.com/juan.quintela/qemu... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=146f515110e86aefe3bc2e8eb581ab724614060f;p=qemu.git

Merge tag 'migration-20230518-pull-request' of https://gitlab.com/juan.quintela/qemu into staging

Migration Pull request

Hi

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

Please apply.

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEGJn/jt6/WMzuA0uC9IfvGFhy1yMFAmRmXJUACgkQ9IfvGFhy
# 1yNRAxAAjDYJELL34Qovt/WE9qKhYJEvIUGTl1IMWJ22YMFnqIFKRdka57dWoU3P
# 7EK1BHmokEEtzGT7Fe1ecERXsOwQIJDIkDTJ5g8Oc8Jt1iqY1AC8h5T+LghijCar
# mbZ6qWHaSjsg2lmek/xc9quymzFGGK36PSyB5WkaLRviKQn4RIkEDpUaWny7nDbA
# Q8zJJpBqNFqKfC5/DN0ePa3QQscXQJhey3nxqFd8hYp8RFNIV5UJVW5Lf6ombtK7
# atgdWC4ckkfO2z3OsghKeo/UiMFWpPktgBVVMhDLmk+P/E6czc2gfzD6SCvrPKTj
# XowI8hro22HVmq9bEY8PtbjMOfpxrAxer+tM2KR/0O9l3UzUacFsi7KGqCJ1/trQ
# 1tSDjlgyczb8GOgLwwxj8XE+jPHPfVrzCNfDqrBKBNxz6nnZSdZUwhV5mG8FdVtm
# oVVV96BIrNXLl/lIxYIFD/Zyvl8/lrSWQdLkEHTzihYQeXaQfyvPVbV/dOLT4sii
# YUuGCuEhF+DW/qz43G1krwq5/bfxsiZoQzrMV/Odtf0wYQKkabA3KNBIda/vxBCR
# dsLQ7QtmOwKmCzjqw4LUov9vDNYOYr98o7ZqwJ3qeKL4QgFwtEZUFO3VW6UR8fnF
# arVXiTn9wVlkTpu4sT5hLm9400iadhX4Fppji7Ce0tUpLbWbghA=
# =3x32
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 18 May 2023 10:12:53 AM PDT
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [undefined]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* tag 'migration-20230518-pull-request' of https://gitlab.com/juan.quintela/qemu:
  migration: Fix duplicated included in meson.build
  migration/multifd: Compute transferred bytes correctly
  migration: We don't need the field rate_limit_used anymore
  migration: Use migration_transferred_bytes() to calculate rate_limit
  migration: Add a trace for migration_transferred_bytes
  migration: Move migration_total_bytes() to migration-stats.c
  migration: Move rate_limit_max and rate_limit_used to migration_stats
  qemu-file: Account for rate_limit usage on qemu_fflush()
  migration: Don't use INT64_MAX for unlimited rate
  migration: process_incoming_migration_co(): move colo part to colo
  migration: split migration_incoming_co
  configure: add --disable-colo-proxy option

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

146f515110e86aefe3bc2e8eb581ab724614060f
diff --cc scripts/meson-buildoptions.sh
index 53124e13a4,a66eb31dae..5714fd93d9
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@@ -252,9 -246,10 +253,11 @@@ _meson_option_parse() 
      --disable-cloop) printf "%s" -Dcloop=disabled ;;
      --enable-cocoa) printf "%s" -Dcocoa=enabled ;;
      --disable-cocoa) printf "%s" -Dcocoa=disabled ;;
+     --enable-colo-proxy) printf "%s" -Dcolo_proxy=enabled ;;
+     --disable-colo-proxy) printf "%s" -Dcolo_proxy=disabled ;;
      --enable-coreaudio) printf "%s" -Dcoreaudio=enabled ;;
      --disable-coreaudio) printf "%s" -Dcoreaudio=disabled ;;
 +    --with-coroutine=*) quote_sh "-Dcoroutine_backend=$2" ;;
      --enable-coroutine-pool) printf "%s" -Dcoroutine_pool=true ;;
      --disable-coroutine-pool) printf "%s" -Dcoroutine_pool=false ;;
      --enable-crypto-afalg) printf "%s" -Dcrypto_afalg=enabled ;;