motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

monitor: inline ambiguous helper functions

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

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20181205203737.9011-2-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-12-06 00:37:31 +04:00 • committed by Markus Armbruster
parent bb9bf94b3e
commit 88e40e4347
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
monitor.c
View file

@ -4453,16 +4453,6 @@ static void sortcmdlist(void)
qsort((void *)info_cmds, array_num, elem_size, compare_mon_cmd); 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) static void monitor_iothread_init(void)
{ {
mon_iothread = iothread_create("mon_iothread", &error_abort); mon_iothread = iothread_create("mon_iothread", &error_abort);
@ -4549,7 +4539,7 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)
GMainContext *context; GMainContext *context;
assert(mon->use_io_thread); assert(mon->use_io_thread);
context = monitor_get_io_context(); context = iothread_get_g_main_context(mon_iothread);
assert(context); assert(context);
qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_qmp_read, qemu_chr_fe_set_handlers(&mon->chr, monitor_can_read, monitor_qmp_read,
monitor_qmp_event, NULL, mon, context, true); 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 * since chardev might be running in the monitor I/O
* thread. Schedule a bottom half. * 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); monitor_qmp_setup_handlers_bh, mon);
/* The bottom half will add @mon to @mon_list */ /* The bottom half will add @mon to @mon_list */
return; return;