From 157b9319878e67f5c28b8cf39216d42f4b162586 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Tue, 6 Apr 2010 16:55:53 +0200 Subject: [PATCH] monitor: Reorder intialization to drop initial mux focus So far a multiplexed monitor started disabled. Restore this property for the new way of configuring by moving the monitor initialization before all devices (the last one to attach to a char-mux will gain the focus). Once we have a real use case for that, we may also consider assigning the initial focus explicitly. Signed-off-by: Jan Kiszka Signed-off-by: Luiz Capitulino --- vl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 20d24be9d0..a485c58fdd 100644 --- a/vl.c +++ b/vl.c @@ -3618,6 +3618,10 @@ int main(int argc, char **argv, char **envp) } } + if (qemu_opts_foreach(&qemu_mon_opts, mon_init_func, NULL, 1) != 0) { + exit(1); + } + if (foreach_device_config(DEV_SERIAL, serial_parse) < 0) exit(1); if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0) @@ -3730,9 +3734,6 @@ int main(int argc, char **argv, char **envp) text_consoles_set_display(ds); - if (qemu_opts_foreach(&qemu_mon_opts, mon_init_func, NULL, 1) != 0) - exit(1); - if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) { fprintf(stderr, "qemu: could not open gdbserver on device '%s'\n", gdbstub_dev); -- 2.11.0