From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue, 6 Apr 2010 14:55:53 +0000 (+0200)
Subject: monitor: Reorder intialization to drop initial mux focus
X-Git-Tag: v0.13.0-rc0~674^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=157b9319878e67f5c28b8cf39216d42f4b162586;p=thirdparty%2Fqemu.git

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>
---

diff --git a/vl.c b/vl.c
index 20d24be9d07..a485c58fdd4 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);