[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 6/7] monitor: move init global earlier
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v9 6/7] monitor: move init global earlier |
Date: |
Tue, 29 May 2018 13:57:54 +0800 |
Before this patch, monitor fd helpers might be called even earlier than
monitor_init_globals(). This can be problematic.
After previous work, now monitor_init_globals() does not depend on
accelerator initialization any more. Call it earlier (before CLI
parsing; that's where the monitor APIs might be called) to make sure it
is called before any of the monitor APIs.
Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
vl.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index 038d7f8042..97b43b399f 100644
--- a/vl.c
+++ b/vl.c
@@ -3074,6 +3074,7 @@ int main(int argc, char **argv, char **envp)
runstate_init();
postcopy_infrastructure_init();
+ monitor_init_globals();
if (qcrypto_init(&err) < 0) {
error_reportf_err(err, "cannot initialize crypto: ");
@@ -4490,12 +4491,6 @@ 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.17.0
- [Qemu-devel] [PATCH v9 2/7] monitor: protect mon->fds with mon_lock, (continued)
[Qemu-devel] [PATCH v9 6/7] monitor: move init global earlier,
Peter Xu <=
[Qemu-devel] [PATCH v9 7/7] monitor: add lock to protect mon_fdsets, Peter Xu, 2018/05/29