From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 9 Jan 2024 10:32:23 +0000 (+0000)
Subject: Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging
X-Git-Tag: v9.0.0~162
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9468484fe904ab4691de6d9c34616667f377ceac;p=mirror_qemu.git

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

Pull request

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmWcJMUACgkQnKSrs4Gr
# c8hh/Qf/Wt177UlhBR49OWmmegs8c8yS1mhyawo7YIJM4pqoXCYLaACpcKECXcGU
# rlgyR4ow68EXnnU8+/s2cp2UqHxrla+E2eNqBoTDmkNt3Cko5sJn5G5PM5EYK+mO
# JjFRzn7awRyxD6mGOuaMVoj6OuHbAA/U4JF7FhW0YuRl8v0/mvAxRSfQ4U6Crq/y
# 19Aa1CXHD1GH2CUJsMCY8zT47Dr4DJcvZx5IpcDFaHaYDCkktFwNzdo5IDnCx2M2
# xnP37Qp/Q93cu12lWkVOu8HCT6yhoszahyOqlBxDmo7QeGkskrxGbMyE+vHM3fFI
# aGSxiw193U7/QWu+Cq2/727C3YIq1g==
# =pKUb
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 08 Jan 2024 16:37:25 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* tag 'block-pull-request' of https://gitlab.com/stefanha/qemu:
  Rename "QEMU global mutex" to "BQL" in comments and docs
  Replace "iothread lock" with "BQL" in comments
  qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql()
  qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to BQL_LOCK_GUARD
  system/cpus: rename qemu_mutex_lock_iothread() to bql_lock()
  iothread: Remove unused Error** argument in aio_context_set_aio_params

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

9468484fe904ab4691de6d9c34616667f377ceac
diff --cc accel/tcg/tcg-accel-ops-rr.c
index 825e35b3dc,5794e5a9ce..3208035d85
--- a/accel/tcg/tcg-accel-ops-rr.c
+++ b/accel/tcg/tcg-accel-ops-rr.c
@@@ -109,9 -109,9 +109,9 @@@ static void rr_wait_io_event(void
  {
      CPUState *cpu;
  
 -    while (all_cpu_threads_idle()) {
 +    while (all_cpu_threads_idle() && replay_can_wait()) {
          rr_stop_kick_timer();
-         qemu_cond_wait_iothread(first_cpu->halt_cond);
+         qemu_cond_wait_bql(first_cpu->halt_cond);
      }
  
      rr_start_kick_timer();