diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-12-08 13:11:37 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-12 07:59:41 -0600 |
commit | 4e307fc883b39c89ffc093c79eb9c9735724d227 (patch) | |
tree | 65de7d10a7bed6570efd7e6b79d4b0654abb3589 | |
parent | 1a688d3bbc2a44bfefa3f6774a11b0385dafc029 (diff) | |
download | hqemu-4e307fc883b39c89ffc093c79eb9c9735724d227.zip hqemu-4e307fc883b39c89ffc093c79eb9c9735724d227.tar.gz |
Revert "monitor: Command-line flag to enable control mode"
This reverts commit adcb181afe5a951c521411c7a8e9d9b791aa6742.
Conflicts:
monitor.h
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | monitor.c | 18 | ||||
-rw-r--r-- | monitor.h | 1 | ||||
-rw-r--r-- | qemu-options.hx | 5 | ||||
-rw-r--r-- | vl.c | 11 |
4 files changed, 6 insertions, 29 deletions
@@ -4038,24 +4038,6 @@ static void monitor_event(void *opaque, int event) * End: */ -const char *monitor_cmdline_parse(const char *cmdline, int *flags) -{ - const char *dev; - - if (strstart(cmdline, "control,", &dev)) { - if (strstart(dev, "vc", NULL)) { - fprintf(stderr, "qemu: control mode is for low-level interaction "); - fprintf(stderr, "cannot be used with device 'vc'\n"); - exit(1); - } - *flags &= ~MONITOR_USE_READLINE; - *flags |= MONITOR_USE_CONTROL; - return dev; - } - - return cmdline; -} - void monitor_init(CharDriverState *chr, int flags) { static int is_first_init = 1; @@ -24,7 +24,6 @@ typedef enum MonitorEvent { } MonitorEvent; void monitor_protocol_event(MonitorEvent event, QObject *data); -const char *monitor_cmdline_parse(const char *cmdline, int *flags); void monitor_init(CharDriverState *chr, int flags); int monitor_suspend(Monitor *mon); diff --git a/qemu-options.hx b/qemu-options.hx index b6f3075..420b7d8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1580,14 +1580,13 @@ Use @code{-parallel none} to disable all parallel ports. ETEXI DEF("monitor", HAS_ARG, QEMU_OPTION_monitor, \ - "-monitor [control,]dev redirect the monitor to char device 'dev'\n") + "-monitor dev redirect the monitor to char device 'dev'\n") STEXI -@item -monitor [@var{control},]@var{dev} +@item -monitor @var{dev} 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. -The option @var{control} enables the QEMU Monitor Protocol. ETEXI DEF("pidfile", HAS_ARG, QEMU_OPTION_pidfile, \ @@ -4648,7 +4648,6 @@ int main(int argc, char **argv, char **envp) const char *r, *optarg; CharDriverState *monitor_hds[MAX_MONITOR_DEVICES]; const char *monitor_devices[MAX_MONITOR_DEVICES]; - int monitor_flags[MAX_MONITOR_DEVICES]; int monitor_device_index; const char *serial_devices[MAX_SERIAL_PORTS]; int serial_device_index; @@ -4751,10 +4750,8 @@ int main(int argc, char **argv, char **envp) #endif monitor_devices[0] = "vc:80Cx24C"; - monitor_flags[0] = MONITOR_IS_DEFAULT | MONITOR_USE_READLINE; for (i = 1; i < MAX_MONITOR_DEVICES; i++) { monitor_devices[i] = NULL; - monitor_flags[i] = MONITOR_USE_READLINE; } monitor_device_index = 0; @@ -5179,9 +5176,7 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "qemu: too many monitor devices\n"); exit(1); } - monitor_devices[monitor_device_index] = - monitor_cmdline_parse(optarg, - &monitor_flags[monitor_device_index]); + monitor_devices[monitor_device_index] = optarg; monitor_device_index++; break; case QEMU_OPTION_chardev: @@ -5891,7 +5886,9 @@ int main(int argc, char **argv, char **envp) for (i = 0; i < MAX_MONITOR_DEVICES; i++) { if (monitor_devices[i] && monitor_hds[i]) { - monitor_init(monitor_hds[i], monitor_flags[i]); + monitor_init(monitor_hds[i], + MONITOR_USE_READLINE | + ((i == 0) ? MONITOR_IS_DEFAULT : 0)); } } |