diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2010-03-07 11:28:40 +0100 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-03-16 08:40:47 +0100 |
commit | 2a7996ce0ed1b1c0db686f60d0ded426698676e6 (patch) | |
tree | f62f976d812ff42ce2cb87ab9c7b772827ceb2d1 /vl.c | |
parent | spelling typo (compatibilty) in hw/fw_cfg.c (diff) | |
download | qemu-kvm-2a7996ce0ed1b1c0db686f60d0ded426698676e6.tar.gz qemu-kvm-2a7996ce0ed1b1c0db686f60d0ded426698676e6.tar.bz2 qemu-kvm-2a7996ce0ed1b1c0db686f60d0ded426698676e6.zip |
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)
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -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; |