[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 07/23] monitor: unify global init
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v8 07/23] monitor: unify global init |
Date: |
Fri, 9 Mar 2018 16:59:50 +0800 |
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 <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
include/monitor/monitor.h | 2 +-
monitor.c | 25 ++++++++++---------------
vl.c | 7 ++++++-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index d1024d4bdc..0cb0538a31 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);
diff --git a/monitor.c b/monitor.c
index 2b70294772..16713b7c6d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1003,7 +1003,7 @@ static void qmp_unregister_commands_hack(void)
#endif
}
-void monitor_init_qmp_commands(void)
+static void monitor_init_qmp_commands(void)
{
/*
* Two command lists:
@@ -3985,6 +3985,14 @@ static void sortcmdlist(void)
qsort((void *)info_cmds, array_num, elem_size, compare_mon_cmd);
}
+void monitor_init_globals(void)
+{
+ monitor_init_qmp_commands();
+ monitor_qapi_event_init();
+ sortcmdlist();
+ qemu_mutex_init(&monitor_lock);
+}
+
/* These functions just adapt the readline interface in a typesafe way. We
* could cast function pointers but that discards compiler checks.
*/
@@ -4025,23 +4033,10 @@ void error_vprintf_unless_qmp(const char *fmt, va_list
ap)
}
}
-static void __attribute__((constructor)) monitor_lock_init(void)
-{
- qemu_mutex_init(&monitor_lock);
-}
-
void monitor_init(Chardev *chr, int flags)
{
- static int is_first_init = 1;
- Monitor *mon;
-
- if (is_first_init) {
- monitor_qapi_event_init();
- sortcmdlist();
- is_first_init = 0;
- }
+ Monitor *mon = g_malloc(sizeof(*mon));
- mon = g_malloc(sizeof(*mon));
monitor_data_init(mon, false);
qemu_chr_fe_init(&mon->chr, chr, &error_abort);
diff --git a/vl.c b/vl.c
index 452fbf5043..4d6b36688f 100644
--- a/vl.c
+++ b/vl.c
@@ -3065,7 +3065,6 @@ int main(int argc, char **argv, char **envp)
qemu_init_exec_dir(argv[0]);
module_call_init(MODULE_INIT_QOM);
- monitor_init_qmp_commands();
qemu_add_opts(&qemu_drive_opts);
qemu_add_drive_opts(&qemu_legacy_drive_opts);
@@ -4535,6 +4534,12 @@ int main(int argc, char **argv, char **envp)
default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
+ /*
+ * Note: qtest_enabled() (which is used in monitor_qapi_event_init())
+ * depends on configure_accelerator() above.
+ */
+ monitor_init_globals();
+
if (qemu_opts_foreach(qemu_find_opts("mon"),
mon_init_func, NULL, NULL)) {
exit(1);
--
2.14.3
- [Qemu-devel] [PATCH v8 02/23] qobject: introduce qstring_get_try_str(), (continued)
- [Qemu-devel] [PATCH v8 02/23] qobject: introduce qstring_get_try_str(), Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 01/23] docs: update QMP documents for OOB commands, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 03/23] qobject: introduce qobject_get_try_str(), Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 04/23] qobject: let object_property_get_str() use new API, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 05/23] monitor: move skip_flush into monitor_data_init, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 06/23] monitor: move the cur_mon hack deeper for QMP, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 08/23] monitor: let mon_list be tail queue, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 07/23] monitor: unify global init,
Peter Xu <=
- [Qemu-devel] [PATCH v8 09/23] monitor: allow using IO thread for parsing, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 10/23] qmp: introduce QMPCapability, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 11/23] monitor: introduce monitor_qmp_respond(), Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 12/23] monitor: let suspend_cnt be thread safe, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 13/23] monitor: let suspend/resume work even with QMPs, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v8 14/23] monitor: separate QMP parser and dispatcher, Peter Xu, 2018/03/09