From: Peter Xu <peterx@redhat.com>
Date: Wed, 15 Aug 2018 13:37:35 +0000 (+0800)
Subject: monitor: simplify monitor_qmp_setup_handlers_bh
X-Git-Tag: v3.1.0-rc0~100^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d7a1c44e2b23079485c0cd21ca2db04f886ec13;p=thirdparty%2Fqemu.git

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 <armbru@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180815133747.25032-2-peterx@redhat.com>
[Insufficiently useful comment dropped]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/monitor.c b/monitor.c
index 021c11b1bf2..c0497766032 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);