aboutsummaryrefslogtreecommitdiff
path: root/include/monitor
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2018-03-09 16:59:50 +0800
committerEric Blake <eblake@redhat.com>2018-03-19 14:58:36 -0500
commit6adf08dd42929542426b055a4b66a5bc0b8e20ba (patch)
treeee702a801d4f4ac7066994fe8d8f33354dda32c7 /include/monitor
parent227a07552f3aff3cefe7eb9f8993c04a420ed962 (diff)
downloadqemu-6adf08dd42929542426b055a4b66a5bc0b8e20ba.zip
qemu-6adf08dd42929542426b055a4b66a5bc0b8e20ba.tar.gz
qemu-6adf08dd42929542426b055a4b66a5bc0b8e20ba.tar.bz2
monitor: unify global init
There are many places where the monitor initializes its globals: - monitor_init_qmp_commands() at the very beginning - single function to init monitor_lock - in the first entry of monitor_init() using "is_first_init" Unify them a bit. monitor_lock is not used before monitor_init() (as confirmed by code analysis and gdb watchpoints); so we are safe delaying what was a constructor-time initialization of the mutex into the later first call to monitor_init(). Reviewed-by: Fam Zheng <famz@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20180309090006.10018-8-peterx@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'include/monitor')
-rw-r--r--include/monitor/monitor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index d1024d4..0cb0538 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -16,7 +16,7 @@ extern Monitor *cur_mon;
bool monitor_cur_is_qmp(void);
-void monitor_init_qmp_commands(void);
+void monitor_init_globals(void);
void monitor_init(Chardev *chr, int flags);
void monitor_cleanup(void);