Markus Armbruster <[email protected]> writes: > Stefan Hajnoczi <[email protected]> writes: > >> monitor_cleanup() is called from the main loop thread. Calling > > Correct. > >> AIO_WAIT_WHILE(qemu_get_aio_context(), ...) from the main loop thread is >> equivalent to AIO_WAIT_WHILE_UNLOCKED(NULL, ...) because neither unlocks >> the AioContext and the latter's assertion that we're in the main loop >> succeeds. >> >> Signed-off-by: Stefan Hajnoczi <[email protected]> >> --- >> monitor/monitor.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/monitor/monitor.c b/monitor/monitor.c >> index 8dc96f6af9..602535696c 100644 >> --- a/monitor/monitor.c >> +++ b/monitor/monitor.c >> @@ -666,7 +666,7 @@ void monitor_cleanup(void) >> * We need to poll both qemu_aio_context and iohandler_ctx to make >> * sure that the dispatcher coroutine keeps making progress and >> * eventually terminates. qemu_aio_context is automatically >> - * polled by calling AIO_WAIT_WHILE on it, but we must poll >> + * polled by calling AIO_WAIT_WHILE_UNLOCKED on it, but we must poll >> * iohandler_ctx manually. >> * >> * Letting the iothread continue while shutting down the dispatcher >> @@ -679,7 +679,7 @@ void monitor_cleanup(void) >> aio_co_wake(qmp_dispatcher_co); >> } >> >> - AIO_WAIT_WHILE(qemu_get_aio_context(), >> + AIO_WAIT_WHILE_UNLOCKED(NULL, >> (aio_poll(iohandler_get_aio_context(), false), >> qatomic_mb_read(&qmp_dispatcher_co_busy))); > > Acked-by: Markus Armbruster <[email protected]> > > For an R-by, I need to understand this in more detail. See my reply to > the previous patch.
Upgrading to Reviewed-by: Markus Armbruster <[email protected]>
