[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/76] monitor: do not use QTAILQ_FOREACH_SAFE across
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 32/76] monitor: do not use QTAILQ_FOREACH_SAFE across critical sections |
Date: |
Tue, 5 Feb 2019 19:14:42 +0100 |
monitor_qmp_requests_pop_any_with_lock cannot modify the monitor list
concurrently with monitor_cleanup, since the dispatch bottom half
runs in the main thread, but anyway it is a bit ugly to keep
"next" live across critical sections of monitor_lock and Coverity
complains (CID 1397072).
Replace QTAILQ_FOREACH_SAFE with a while loop and QTAILQ_FIRST,
it is cleaner and more future-proof.
Signed-off-by: Paolo Bonzini <address@hidden>
---
monitor.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index c09fa63..e5de576 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4617,8 +4617,6 @@ void monitor_init(Chardev *chr, int flags)
void monitor_cleanup(void)
{
- Monitor *mon, *next;
-
/*
* We need to explicitly stop the I/O thread (but not destroy it),
* clean up the monitor resources, then destroy the I/O thread since
@@ -4632,7 +4630,8 @@ void monitor_cleanup(void)
/* Flush output buffers and destroy monitors */
qemu_mutex_lock(&monitor_lock);
monitor_destroyed = true;
- QTAILQ_FOREACH_SAFE(mon, &mon_list, entry, next) {
+ while (!QTAILQ_EMPTY(&mon_list)) {
+ Monitor *mon = QTAILQ_FIRST(&mon_list);
QTAILQ_REMOVE(&mon_list, mon, entry);
/* Permit QAPI event emission from character frontend release */
qemu_mutex_unlock(&monitor_lock);
--
1.8.3.1
- [Qemu-devel] [PULL 09/76] configure: Add a proper check for openpty() in libutil, (continued)
- [Qemu-devel] [PULL 09/76] configure: Add a proper check for openpty() in libutil, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 15/76] pvh: load initrd and expose it through fw_cfg, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 24/76] Revert "i386: Add CPUID bit for PCONFIG", Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 19/76] hw/i386/pc: use PVH option rom, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 26/76] contrib/elf2dmp: fix elf.h including, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 12/76] elf-ops.h: Add get_elf_note_type(), Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 21/76] hw/i386/pc: enable PVH only for machine type >= 4.0, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 27/76] contrib/elf2dmp: use GLib in ELF processing, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 29/76] contrib/elf2dmp: fix structures definitions, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 28/76] contrib/elf2dmp: use GLib in PDB processing, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 32/76] monitor: do not use QTAILQ_FOREACH_SAFE across critical sections,
Paolo Bonzini <=
- [Qemu-devel] [PULL 38/76] i386: allow to load initrd below 4 GB for recent linux, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 42/76] scsi-generic: avoid possible out-of-bounds access to r->buf, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 37/76] i386: import & use bootparam.h, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 47/76] vfio: move conditional up to hw/Makefile.objs, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 14/76] pvh: Boot uncompressed kernel using direct boot ABI, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 31/76] configure: enable elf2dmp build for Windows hosts, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 16/76] linuxboot_dma: remove duplicate definitions of FW_CFG, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 04/76] vhost-user-test: skip if there is no memory at address 0, Paolo Bonzini, 2019/02/05