Patchwork [2/3] monitor: Reorder intialization to drop initial mux focus

login
register
mail settings
Submitter Jan Kiszka
Date April 6, 2010, 2:55 p.m.
Message ID <1a7db6cc22c5c0733f1adda5223eb5abae58ac05.1270565748.git.jan.kiszka@siemens.com>
Download mbox | patch
Permalink /patch/49523/
State New
Headers show

Comments

Jan Kiszka - April 6, 2010, 2:55 p.m.
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>
---
 vl.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/vl.c b/vl.c
index bda5f1e..d4734c1 100644
--- a/vl.c
+++ b/vl.c
@@ -3712,6 +3712,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)
@@ -3824,9 +3828,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);