[Qemu-devel] [FOR 0.12 PATCH v3 01/21] Revert "monitor: Command-line flag to enable control mode"

[Gerd Hoffmann]

This reverts commit adcb181afe5a951c521411c7a8e9d9b791aa6742.

Conflicts:

        monitor.h

Signed-off-by: Gerd Hoffmann <address@hidden>
---
 monitor.c       |   18 ------------------
 monitor.h       |    1 -
 qemu-options.hx |    5 ++---
 vl.c            |   11 ++++-------
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/monitor.c b/monitor.c
index ba76f34..0ae05a0 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4008,24 +4008,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;
diff --git a/monitor.h b/monitor.h
index 38cc223..6ed117a 100644
--- a/monitor.h
+++ b/monitor.h
@@ -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 1b5781a..b65fd74 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1577,14 +1577,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
address@hidden -monitor address@hidden,address@hidden
address@hidden -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, \
diff --git a/vl.c b/vl.c
index 09a0ec5..86171d0 100644
--- a/vl.c
+++ b/vl.c
@@ -4638,7 +4638,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;
@@ -4741,10 +4740,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;
 
@@ -5165,9 +5162,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:
@@ -5875,7 +5870,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));
         }
     }
 
-- 
1.6.5.2