mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql()

Browse Source 
The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL)
instead, it is already widely used and unambiguous.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-id: 20240102153529.486531-4-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2024-01-02 10:35:27 -05:00
parent 32ead8e62f
commit 7c754c787e
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accel/tcg/tcg-accel-ops-rr.c
View File

@ -111,7 +111,7 @@ static void rr_wait_io_event(void)
while (all_cpu_threads_idle()) { while (all_cpu_threads_idle()) {
rr_stop_kick_timer(); rr_stop_kick_timer();
qemu_cond_wait_iothread(first_cpu->halt_cond); qemu_cond_wait_bql(first_cpu->halt_cond);
} }
rr_start_kick_timer(); rr_start_kick_timer();
@ -198,7 +198,7 @@ static void *rr_cpu_thread_fn(void *arg)
/* wait for initial kick-off after machine start */ /* wait for initial kick-off after machine start */
while (first_cpu->stopped) { while (first_cpu->stopped) {
qemu_cond_wait_iothread(first_cpu->halt_cond); qemu_cond_wait_bql(first_cpu->halt_cond);
/* process any pending work */ /* process any pending work */
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {

2
hw/display/virtio-gpu.c
View File

@ -1512,7 +1512,7 @@ void virtio_gpu_reset(VirtIODevice *vdev)
g->reset_finished = false; g->reset_finished = false;
qemu_bh_schedule(g->reset_bh); qemu_bh_schedule(g->reset_bh);
while (!g->reset_finished) { while (!g->reset_finished) {
qemu_cond_wait_iothread(&g->reset_cond); qemu_cond_wait_bql(&g->reset_cond);
} }
} else { } else {
virtio_gpu_reset_bh(g); virtio_gpu_reset_bh(g);

2
hw/ppc/spapr_events.c
View File

@ -899,7 +899,7 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered)
} }
return; return;
} }
qemu_cond_wait_iothread(&spapr->fwnmi_machine_check_interlock_cond); qemu_cond_wait_bql(&spapr->fwnmi_machine_check_interlock_cond);
if (spapr->fwnmi_machine_check_addr == -1) { if (spapr->fwnmi_machine_check_addr == -1) {
/* /*
* If the machine was reset while waiting for the interlock, * If the machine was reset while waiting for the interlock,

10
include/qemu/main-loop.h
View File

@ -371,17 +371,17 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(BQLLockAuto, bql_auto_unlock)
= bql_auto_lock(__FILE__, __LINE__) = bql_auto_lock(__FILE__, __LINE__)
/* /*
* qemu_cond_wait_iothread: Wait on condition for the main loop mutex * qemu_cond_wait_bql: Wait on condition for the Big QEMU Lock (BQL)
* *
* This function atomically releases the main loop mutex and causes * This function atomically releases the Big QEMU Lock (BQL) and causes
* the calling thread to block on the condition. * the calling thread to block on the condition.
*/ */
void qemu_cond_wait_iothread(QemuCond *cond); void qemu_cond_wait_bql(QemuCond *cond);
/* /*
* qemu_cond_timedwait_iothread: like the previous, but with timeout * qemu_cond_timedwait_bql: like the previous, but with timeout
*/ */
void qemu_cond_timedwait_iothread(QemuCond *cond, int ms); void qemu_cond_timedwait_bql(QemuCond *cond, int ms);
/* internal interfaces */ /* internal interfaces */

2
system/cpu-throttle.c
View File

@ -54,7 +54,7 @@ static void cpu_throttle_thread(CPUState *cpu, run_on_cpu_data opaque)
endtime_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + sleeptime_ns; endtime_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + sleeptime_ns;
while (sleeptime_ns > 0 && !cpu->stop) { while (sleeptime_ns > 0 && !cpu->stop) {
if (sleeptime_ns > SCALE_MS) { if (sleeptime_ns > SCALE_MS) {
qemu_cond_timedwait_iothread(cpu->halt_cond, qemu_cond_timedwait_bql(cpu->halt_cond,
sleeptime_ns / SCALE_MS); sleeptime_ns / SCALE_MS);
} else { } else {
bql_unlock(); bql_unlock();

4
system/cpus.c
View File

@ -533,12 +533,12 @@ void bql_unlock(void)
qemu_mutex_unlock(&bql); qemu_mutex_unlock(&bql);
} }
void qemu_cond_wait_iothread(QemuCond *cond) void qemu_cond_wait_bql(QemuCond *cond)
{ {
qemu_cond_wait(cond, &bql); qemu_cond_wait(cond, &bql);
} }
void qemu_cond_timedwait_iothread(QemuCond *cond, int ms) void qemu_cond_timedwait_bql(QemuCond *cond, int ms)
{ {
qemu_cond_timedwait(cond, &bql, ms); qemu_cond_timedwait(cond, &bql, ms);
} }

2
target/i386/nvmm/nvmm-accel-ops.c
View File

@ -48,7 +48,7 @@ static void *qemu_nvmm_cpu_thread_fn(void *arg)
} }
} }
while (cpu_thread_is_idle(cpu)) { while (cpu_thread_is_idle(cpu)) {
qemu_cond_wait_iothread(cpu->halt_cond); qemu_cond_wait_bql(cpu->halt_cond);
} }
qemu_wait_io_event_common(cpu); qemu_wait_io_event_common(cpu);
} while (!cpu->unplug || cpu_can_run(cpu)); } while (!cpu->unplug || cpu_can_run(cpu));

2
target/i386/whpx/whpx-accel-ops.c
View File

@ -48,7 +48,7 @@ static void *whpx_cpu_thread_fn(void *arg)
} }
} }
while (cpu_thread_is_idle(cpu)) { while (cpu_thread_is_idle(cpu)) {
qemu_cond_wait_iothread(cpu->halt_cond); qemu_cond_wait_bql(cpu->halt_cond);
} }
qemu_wait_io_event_common(cpu); qemu_wait_io_event_common(cpu);
} while (!cpu->unplug || cpu_can_run(cpu)); } while (!cpu->unplug || cpu_can_run(cpu));