Commit bd6079a7a1 for qemu.org

commit bd6079a7a1d14de0918a7715ef6db85dc32de3bb
Merge: 90229f6aba 60f2281450
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date:   Mon Jul 20 11:12:38 2026 -0400

    Merge tag 'next-pull-request' of https://gitlab.com/peterx/qemu into staging

    Migration pull for rc1

    - Bin's cleanup on migration blocktime (partly)
    - Yujun's fix on print format

    # -----BEGIN PGP SIGNATURE-----
    #
    # iIgEABYKADAWIQS5GE3CDMRX2s990ak7X8zN86vXBgUCal43iBIccGV0ZXJ4QHJl
    # ZGhhdC5jb20ACgkQO1/MzfOr1wYzkwD9H0wbDbw9KNk4Wz5bwqa3SblpniWRByEg
    # OeCWcZ68th8BAOS+jwufS002GImaUCYZLlsg0oRAYnTOp45vU65z5y0B
    # =VOpz
    # -----END PGP SIGNATURE-----
    # gpg: Signature made Mon 20 Jul 2026 10:58:16 EDT
    # gpg:                using EDDSA key B9184DC20CC457DACF7DD1A93B5FCCCDF3ABD706
    # gpg:                issuer "peterx@redhat.com"
    # gpg: Good signature from "Peter Xu <xzpeter@gmail.com>" [full]
    # gpg:                 aka "Peter Xu <peterx@redhat.com>" [full]
    # Primary key fingerprint: B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706

    * tag 'next-pull-request' of https://gitlab.com/peterx/qemu:
      migration: clean up postcopy blocktime presentation
      migration: fix ineffective overflow assert in postcopy blocktime
      migration: Fix invalid %ud format and trace arg typo

    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --cc migration/trace-events
index f5339f4193,3b1258c3bf..af0e784535
--- a/migration/trace-events
+++ b/migration/trace-events
@@@ -20,11 -21,10 +20,11 @@@ loadvm_postcopy_handle_run(void) "
  loadvm_postcopy_handle_resume(void) ""
  loadvm_postcopy_ram_handle_discard(void) ""
  loadvm_postcopy_ram_handle_discard_end(void) ""
- loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %ud"
+ loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %u"
  loadvm_process_command(const char *s, uint16_t len) "com=%s len=%d"
  loadvm_process_command_ping(uint32_t val) "0x%x"
 -loadvm_approve_switchover(unsigned int switchover_ack_pending_num) "Switchover ack pending num=%u"
 +loadvm_approve_switchover_legacy(const char *approver, unsigned int switchover_ack_pending_num_legacy) "Approver %s, switchover_ack_pending_num_legacy %u"
 +loadvm_approve_switchover(const char *approver) "Approver %s"
  postcopy_ram_listen_thread_exit(void) ""
  postcopy_ram_listen_thread_start(void) ""
  qemu_savevm_send_postcopy_advise(void) ""