diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2010-04-06 16:55:53 +0200 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2010-04-26 16:36:31 -0300 |
commit | 157b9319878e67f5c28b8cf39216d42f4b162586 (patch) | |
tree | 673a49c316e0da4432de07dcaca0ff3759fa132f /vl.c | |
parent | 140e065d72a2301b0b5f769be664e10ebe223888 (diff) | |
download | hqemu-157b9319878e67f5c28b8cf39216d42f4b162586.zip hqemu-157b9319878e67f5c28b8cf39216d42f4b162586.tar.gz |
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 <jan.kiszka@siemens.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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); |