[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RESEND][PATCH][STABLE] Don't set default monitor when ther
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one |
Date: |
Sun, 07 Mar 2010 11:28:40 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
This fixes eg. "-nographic -serial mon:stdio [-serial ...]".
Signed-off-by: Jan Kiszka <address@hidden>
---
vl.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/vl.c b/vl.c
index 10d8e34..bffb796 100644
--- a/vl.c
+++ b/vl.c
@@ -5369,6 +5369,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) {
@@ -5387,10 +5390,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_debugcon:
add_device_config(DEV_DEBUGCON, optarg);
- [Qemu-devel] [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one,
Jan Kiszka <=