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

monitor: Replace monitor_init() with monitor_init_{hmp, qmp}()

Browse source 
Most callers know which monitor type they want to have. Instead of
calling monitor_init() with flags that can describe both types of
monitors, make monitor_init_{hmp,qmp}() public interfaces that take
specific bools instead of flags and call these functions directly.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20190613153405.24769-15-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Kevin Wolf 2019-06-13 17:34:04 +02:00 • committed by Markus Armbruster
parent 920824165c
commit fbfc29e3bf
10 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
monitor/hmp.c
View file

@ -1395,14 +1395,14 @@ static void monitor_readline_flush(void *opaque)
monitor_flush(&mon->common);
}
void monitor_init_hmp(Chardev *chr, int flags)
void monitor_init_hmp(Chardev *chr, bool use_readline)
{
MonitorHMP *mon = g_new0(MonitorHMP, 1);
monitor_data_init(&mon->common, false, false, false);
qemu_chr_fe_init(&mon->common.chr, chr, &error_abort);
mon->use_readline = flags & MONITOR_USE_READLINE;
mon->use_readline = use_readline;
if (mon->use_readline) {
mon->rs = readline_init(monitor_readline_printf,
monitor_readline_flush,

3
monitor/monitor-internal.h
View file

@ -163,9 +163,6 @@ extern int mon_refcount;
extern HMPCommand hmp_cmds[];
void monitor_init_qmp(Chardev *chr, int flags);
void monitor_init_hmp(Chardev *chr, int flags);
int monitor_puts(Monitor *mon, const char *str);
void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush,
bool use_io_thread);

9
monitor/monitor.c
View file

@ -551,15 +551,6 @@ void monitor_data_destroy(Monitor *mon)
qemu_mutex_destroy(&mon->mon_lock);
}
void monitor_init(Chardev *chr, int flags)
{
if (flags & MONITOR_USE_CONTROL) {
monitor_init_qmp(chr, flags);
} else {
monitor_init_hmp(chr, flags);
}
}
void monitor_cleanup(void)
{
/*

7
monitor/qmp.c
View file

@ -364,18 +364,15 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)
monitor_list_append(&mon->common);
}
void monitor_init_qmp(Chardev *chr, int flags)
void monitor_init_qmp(Chardev *chr, bool pretty)
{
MonitorQMP *mon = g_new0(MonitorQMP, 1);
/* Only HMP supports readline */
assert(!(flags & MONITOR_USE_READLINE));
/* Note: we run QMP monitor in I/O thread when @chr supports that */
monitor_data_init(&mon->common, true, false,
qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT));
mon->pretty = flags & MONITOR_USE_PRETTY;
mon->pretty = pretty;
qemu_mutex_init(&mon->qmp_queue_lock);
mon->qmp_requests = g_queue_new();