ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitor: move skip_flush into monitor_data_init 

It's part of the data init.  Collect it.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180309090006.10018-6-peterx@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Xu 2018-03-09 16:59:48 +08:00 committed by Eric Blake
parent aafb21a0b9
commit 88a95d1090
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monitor.c
View File

@ -570,13 +570,14 @@ static void monitor_qapi_event_init(void)
static void handle_hmp_command(Monitor *mon, const char *cmdline); static void handle_hmp_command(Monitor *mon, const char *cmdline);
static void monitor_data_init(Monitor *mon) static void monitor_data_init(Monitor *mon, bool skip_flush)
{ {
memset(mon, 0, sizeof(Monitor)); memset(mon, 0, sizeof(Monitor));
qemu_mutex_init(&mon->out_lock); qemu_mutex_init(&mon->out_lock);
mon->outbuf = qstring_new(); mon->outbuf = qstring_new();
/* Use *mon_cmds by default. */ /* Use *mon_cmds by default. */
mon->cmd_table = mon_cmds; mon->cmd_table = mon_cmds;
mon->skip_flush = skip_flush;
} }
static void monitor_data_destroy(Monitor *mon) static void monitor_data_destroy(Monitor *mon)
@ -597,8 +598,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
char *output = NULL; char *output = NULL;
Monitor *old_mon, hmp; Monitor *old_mon, hmp;
monitor_data_init(&hmp); monitor_data_init(&hmp, true);
hmp.skip_flush = true;
old_mon = cur_mon; old_mon = cur_mon;
cur_mon = &hmp; cur_mon = &hmp;
@ -4042,7 +4042,7 @@ void monitor_init(Chardev *chr, int flags)
} }
mon = g_malloc(sizeof(*mon)); mon = g_malloc(sizeof(*mon));
monitor_data_init(mon); monitor_data_init(mon, false);
qemu_chr_fe_init(&mon->chr, chr, &error_abort); qemu_chr_fe_init(&mon->chr, chr, &error_abort);
mon->flags = flags; mon->flags = flags;