[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] monitor: simplify monitor_qmp_setup_handlers_bh
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 1/6] monitor: simplify monitor_qmp_setup_handlers_bh |
Date: |
Sat, 1 Sep 2018 13:17:11 +0200 |
From: Peter Xu <address@hidden>
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>
Message-Id: <address@hidden>
[Insufficiently useful comment dropped]
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
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);
--
2.17.1
- [Qemu-devel] [PULL 0/6] Monitor patches for 2018-09-01, Markus Armbruster, 2018/09/01
- [Qemu-devel] [PULL 6/6] monitor: no need to save need_resume, Markus Armbruster, 2018/09/01
- [Qemu-devel] [PULL 4/6] qmp: constify qmp_is_oob(), Markus Armbruster, 2018/09/01
- [Qemu-devel] [PULL 2/6] monitor: accept input on resume, Markus Armbruster, 2018/09/01
- [Qemu-devel] [PULL 5/6] Revert "qmp: isolate responses into io thread", Markus Armbruster, 2018/09/01
- [Qemu-devel] [PULL 3/6] monitor: consitify qmp_send_response() QDict argument, Markus Armbruster, 2018/09/01
- [Qemu-devel] [PULL 1/6] monitor: simplify monitor_qmp_setup_handlers_bh,
Markus Armbruster <=
- Re: [Qemu-devel] [PULL 0/6] Monitor patches for 2018-09-01, Peter Maydell, 2018/09/24