[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 6/7] monitor: move init global earlier
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v10 6/7] monitor: move init global earlier |
Date: |
Fri, 8 Jun 2018 11:55:10 +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>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-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 06031715ac..5ddea3d235 100644
--- a/vl.c
+++ b/vl.c
@@ -2978,6 +2978,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: ");
@@ -4412,12 +4413,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.1
- [Qemu-devel] [PATCH v10 0/7] monitor: let Monitor be thread safe, Peter Xu, 2018/06/07
- [Qemu-devel] [PATCH v10 1/7] monitor: rename out_lock to mon_lock, Peter Xu, 2018/06/07
- [Qemu-devel] [PATCH v10 2/7] monitor: protect mon->fds with mon_lock, Peter Xu, 2018/06/07
- [Qemu-devel] [PATCH v10 3/7] monitor: more comments on lock-free elements, Peter Xu, 2018/06/07
- [Qemu-devel] [PATCH v10 4/7] monitor: fix comment for monitor_lock, Peter Xu, 2018/06/07
- [Qemu-devel] [PATCH v10 5/7] monitor: remove event_clock_type, Peter Xu, 2018/06/07
- Re: [Qemu-devel] [PATCH v10 5/7] monitor: remove event_clock_type, Stefan Hajnoczi, 2018/06/08
- [Qemu-devel] [PATCH v10 6/7] monitor: move init global earlier,
Peter Xu <=
- [Qemu-devel] [PATCH v10 7/7] monitor: add lock to protect mon_fdsets, Peter Xu, 2018/06/07