summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2013-05-16 12:02:55 -0400
committerLuiz Capitulino <lcapitulino@redhat.com>2013-05-23 09:58:45 -0400
commit70e098af88f79340d420992af526254866a42ddd (patch)
treebd5bb47861b2fa77d81d37dd684e1be46005ceec
parentb2d1674b75563326515cf2178cc1d0a002797a12 (diff)
downloadqemu-70e098af88f79340d420992af526254866a42ddd.tar.gz
monitor: allow to disable the default monitor
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
-rw-r--r--qemu-options.hx1
-rw-r--r--vl.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index fb3961d8f7..bf94862b58 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2528,6 +2528,7 @@ Redirect the monitor to host device @var{dev} (same devices as the
serial port).
The default device is @code{vc} in graphical mode and @code{stdio} in
non graphical mode.
+Use @code{-monitor none} to disable the default monitor.
ETEXI
DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \
"-qmp dev like -monitor but opens in 'control' mode\n",
diff --git a/vl.c b/vl.c
index 59dc0b45da..510d2c2ce4 100644
--- a/vl.c
+++ b/vl.c
@@ -3366,8 +3366,10 @@ int main(int argc, char **argv, char **envp)
break;
}
case QEMU_OPTION_monitor:
- monitor_parse(optarg, "readline");
default_monitor = 0;
+ if (strncmp(optarg, "none", 4)) {
+ monitor_parse(optarg, "readline");
+ }
break;
case QEMU_OPTION_qmp:
monitor_parse(optarg, "control");