[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 01/13] monitor: simplify monitor_qmp_setup_handle
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v6 01/13] monitor: simplify monitor_qmp_setup_handlers_bh |
Date: |
Wed, 15 Aug 2018 21:37:35 +0800 |
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 <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
monitor.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/monitor.c b/monitor.c
index 77861e96af..5cd9398824 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4624,15 +4624,10 @@ 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);
+ /* Use @mon_iothread context */
+ 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);
--
2.17.1