Commit 3d7a1c44 authored by Peter Xu's avatar Peter Xu Committed by Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180815133747.25032-2-peterx@redhat.com>
[Insufficiently useful comment dropped]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 19b599f7

monitor.c

+3 −9
Original line number Diff line number Diff line
@@ -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 */

    assert(mon->use_io_thread);

    context = monitor_get_io_context();

    assert(context);

    } else {

        /* Use default main loop context */

        context = NULL;

    }



    qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_qmp_read,

                             monitor_qmp_event, NULL, mon, context, true);

    monitor_list_append(mon);