monitor: Fix assertion failure on shutdown
commitc81219a7dd36a815bd85beed9932fc973d4f5d51
authorKevin Wolf <kwolf@redhat.com>
Fri, 12 Feb 2021 17:20:27 +0000 (12 18:20 +0100)
committerKevin Wolf <kwolf@redhat.com>
Mon, 15 Feb 2021 14:10:14 +0000 (15 15:10 +0100)
treeb3a4890962fba3772758b2ca08e83d304b9bcdf6
parent6094cbeb72117204f3302a4581415ee1dc33a879
monitor: Fix assertion failure on shutdown

Commit 357bda95 already tried to fix the order in monitor_cleanup() by
moving shutdown of the dispatcher coroutine further to the start.
However, it didn't go far enough:

iothread_stop() makes sure that all pending work (bottom halves) in the
AioContext of the monitor iothread is completed. iothread_destroy()
depends on this and fails an assertion if there is still a pending BH.

While the dispatcher coroutine is running, it will try to resume the
monitor after taking a request out of the queue, which involves a BH.
The dispatcher is run until it terminates in the AIO_WAIT_WHILE() loop.
However, adding new BHs between iothread_stop() and iothread_destroy()
is forbidden.

Fix this by stopping the dispatcher first before shutting down the other
parts of the monitor. This means we can now receive requests that aren't
handled any more when QEMU is shutting down, but this is unlikely to be
a problem for QMP clients.

Fixes: 357bda9590784ff75803d52de43150d4107ed98e
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210212172028.288825-2-kwolf@redhat.com>
Tested-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
monitor/monitor.c