Commit 82e870ba authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

monitor: do not use QTAILQ_FOREACH_SAFE across critical sections 



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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1b9d35f3

monitor.c

+2 −3
Original line number Diff line number Diff line
@@ -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);