From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 7 Mar 2010 10:28:40 +0000 (+0100)
Subject: Don't set default monitor when there is a mux'ed one
X-Git-Tag: v0.12.4~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a7996ce0ed1b1c0db686f60d0ded426698676e6;p=thirdparty%2Fqemu.git

Don't set default monitor when there is a mux'ed one

This fixes eg. "-nographic -serial mon:stdio [-serial ...]".

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
(cherry picked from commit 18141ed67f5ee8c7e8e3f8bffdb24d7b8cdbc270)
---

diff --git a/vl.c b/vl.c
index bb9c21ce81c..425bb4b6fb4 100644
--- a/vl.c
+++ b/vl.c
@@ -5368,6 +5368,9 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_serial:
                 add_device_config(DEV_SERIAL, optarg);
                 default_serial = 0;
+                if (strncmp(optarg, "mon:", 4) == 0) {
+                    default_monitor = 0;
+                }
                 break;
             case QEMU_OPTION_watchdog:
                 if (watchdog) {
@@ -5386,10 +5389,16 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_virtiocon:
                 add_device_config(DEV_VIRTCON, optarg);
                 default_virtcon = 0;
+                if (strncmp(optarg, "mon:", 4) == 0) {
+                    default_monitor = 0;
+                }
                 break;
             case QEMU_OPTION_parallel:
                 add_device_config(DEV_PARALLEL, optarg);
                 default_parallel = 0;
+                if (strncmp(optarg, "mon:", 4) == 0) {
+                    default_monitor = 0;
+                }
                 break;
 	    case QEMU_OPTION_loadvm:
 		loadvm = optarg;