diff options
author | Peter Xu <peterx@redhat.com> | 2018-06-08 11:55:10 +0800 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2018-06-18 15:48:22 +0200 |
commit | d32749deb61513c5456901f20e19887e1bc3d7f3 (patch) | |
tree | 2febe5abcb63b6a30389c7e76227e643d5a673e4 /vl.c | |
parent | 6e8c5f4db7cb74f6f00942a285b4ed6a130c244b (diff) | |
download | qemu-d32749deb61513c5456901f20e19887e1bc3d7f3.zip qemu-d32749deb61513c5456901f20e19887e1bc3d7f3.tar.gz qemu-d32749deb61513c5456901f20e19887e1bc3d7f3.tar.bz2 |
monitor: move init global earlier
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 <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180608035511.7439-7-peterx@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -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); |