diff mbox series

[PULL,16/36] monitor: move skip_flush into monitor_data_init

Message ID 20180312183628.394722-17-eblake@redhat.com
State New
Headers show
Series [PULL,01/36] qapi2texi: minor python code simplification | expand

Commit Message

Eric Blake March 12, 2018, 6:36 p.m. UTC 
From: Peter Xu <peterx@redhat.com>

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>
---
 monitor.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/monitor.c b/monitor.c
index c18a2f2dc98..b5acc92b735 100644
--- a/monitor.c
+++ b/monitor.c
@@ -570,13 +570,14 @@  static void monitor_qapi_event_init(void)

 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));
     qemu_mutex_init(&mon->out_lock);
     mon->outbuf = qstring_new();
     /* Use *mon_cmds by default. */
     mon->cmd_table = mon_cmds;
+    mon->skip_flush = skip_flush;
 }

 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;
     Monitor *old_mon, hmp;

-    monitor_data_init(&hmp);
-    hmp.skip_flush = true;
+    monitor_data_init(&hmp, true);

     old_mon = cur_mon;
     cur_mon = &hmp;
@@ -4039,7 +4039,7 @@  void monitor_init(Chardev *chr, int flags)
     }

     mon = g_malloc(sizeof(*mon));
-    monitor_data_init(mon);
+    monitor_data_init(mon, false);

     qemu_chr_fe_init(&mon->chr, chr, &error_abort);
     mon->flags = flags;