Commit 88e40e43 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

monitor: inline ambiguous helper functions 



The function were not named with "mon_iothread", or following the AIO
vs GMainContext distinction. Inline them instead.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20181205203737.9011-2-marcandre.lureau@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent bb9bf94b

monitor.c

+2 −12
Original line number Diff line number Diff line
@@ -4453,16 +4453,6 @@ static void sortcmdlist(void) 
    qsort((void *)info_cmds, array_num, elem_size, compare_mon_cmd);

}



static GMainContext *monitor_get_io_context(void)

{

    return iothread_get_g_main_context(mon_iothread);

}



static AioContext *monitor_get_aio_context(void)

{

    return iothread_get_aio_context(mon_iothread);

}



static void monitor_iothread_init(void)

{

    mon_iothread = iothread_create("mon_iothread", &error_abort);
@@ -4549,7 +4539,7 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) 
    GMainContext *context;



    assert(mon->use_io_thread);

    context = monitor_get_io_context();

    context = iothread_get_g_main_context(mon_iothread);

    assert(context);

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

                             monitor_qmp_event, NULL, mon, context, true);
@@ -4601,7 +4591,7 @@ void monitor_init(Chardev *chr, int flags) 
             * since chardev might be running in the monitor I/O

             * thread.  Schedule a bottom half.

             */

            aio_bh_schedule_oneshot(monitor_get_aio_context(),

            aio_bh_schedule_oneshot(iothread_get_aio_context(mon_iothread),

                                    monitor_qmp_setup_handlers_bh, mon);

            /* The bottom half will add @mon to @mon_list */

            return;