falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 18141ed67f)
This commit is contained in:
Jan Kiszka 2010-03-07 11:28:40 +01:00 committed by Aurelien Jarno
parent 8ec131fb59
commit 2a7996ce0e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vl.c
View File

@ -5368,6 +5368,9 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_serial: case QEMU_OPTION_serial:
add_device_config(DEV_SERIAL, optarg); add_device_config(DEV_SERIAL, optarg);
default_serial = 0; default_serial = 0;
if (strncmp(optarg, "mon:", 4) == 0) {
default_monitor = 0;
}
break; break;
case QEMU_OPTION_watchdog: case QEMU_OPTION_watchdog:
if (watchdog) { if (watchdog) {
@ -5386,10 +5389,16 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_virtiocon: case QEMU_OPTION_virtiocon:
add_device_config(DEV_VIRTCON, optarg); add_device_config(DEV_VIRTCON, optarg);
default_virtcon = 0; default_virtcon = 0;
if (strncmp(optarg, "mon:", 4) == 0) {
default_monitor = 0;
}
break; break;
case QEMU_OPTION_parallel: case QEMU_OPTION_parallel:
add_device_config(DEV_PARALLEL, optarg); add_device_config(DEV_PARALLEL, optarg);
default_parallel = 0; default_parallel = 0;
if (strncmp(optarg, "mon:", 4) == 0) {
default_monitor = 0;
}
break; break;
case QEMU_OPTION_loadvm: case QEMU_OPTION_loadvm:
loadvm = optarg; loadvm = optarg;