Commit d32749de authored by Peter Xu's avatar Peter Xu Committed by Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180608035511.7439-7-peterx@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 6e8c5f4d

vl.c

+1 −6
Original line number Diff line number Diff line
@@ -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);