From 3d7a1c44e2b23079485c0cd21ca2db04f886ec13 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Wed, 15 Aug 2018 21:37:35 +0800 Subject: monitor: simplify monitor_qmp_setup_handlers_bh When we reach monitor_qmp_setup_handlers_bh() we must be using the IOThread then, so no need to check against it any more. Instead, we assert. Reviewed-by: Markus Armbruster Signed-off-by: Peter Xu Message-Id: <20180815133747.25032-2-peterx@redhat.com> [Insufficiently useful comment dropped] Signed-off-by: Markus Armbruster --- monitor.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index 021c11b1bf..c049776603 100644 --- a/monitor.c +++ b/monitor.c @@ -4631,15 +4631,9 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) Monitor *mon = opaque; GMainContext *context; - if (mon->use_io_thread) { - /* Use @mon_iothread context */ - context = monitor_get_io_context(); - assert(context); - } else { - /* Use default main loop context */ - context = NULL; - } - + assert(mon->use_io_thread); + context = monitor_get_io_context(); + assert(context); qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, NULL, mon, context, true); monitor_list_append(mon); -- cgit v1.2.3