[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [FOR 0.12 PATCH v4 20/22] add -qmp convinience switch
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [FOR 0.12 PATCH v4 20/22] add -qmp convinience switch |
Date: |
Tue, 8 Dec 2009 13:11:52 +0100 |
Acts like -monitor but switched into qmp mode.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-options.hx | 2 ++
vl.c | 14 +++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 7234447..b8cc375 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1588,6 +1588,8 @@ serial port).
The default device is @code{vc} in graphical mode and @code{stdio} in
non graphical mode.
ETEXI
+DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \
+ "-qmp dev like -monitor but opens in 'control' mode.\n")
DEF("mon", HAS_ARG, QEMU_OPTION_mon, \
"-mon chardev=[name][,mode=readline|control][,default]\n")
diff --git a/vl.c b/vl.c
index d90975f..ab77c35 100644
--- a/vl.c
+++ b/vl.c
@@ -4660,7 +4660,7 @@ static int mon_init_func(QemuOpts *opts, void *opaque)
return 0;
}
-static void monitor_parse(const char *optarg)
+static void monitor_parse(const char *optarg, const char *mode)
{
static int monitor_device_index = 0;
QemuOpts *opts;
@@ -4690,7 +4690,7 @@ static void monitor_parse(const char *optarg)
fprintf(stderr, "duplicate chardev: %s\n", label);
exit(1);
}
- qemu_opt_set(opts, "mode", "readline");
+ qemu_opt_set(opts, "mode", mode);
qemu_opt_set(opts, "chardev", label);
if (def)
qemu_opt_set(opts, "default", "on");
@@ -5281,7 +5281,11 @@ int main(int argc, char **argv, char **envp)
break;
}
case QEMU_OPTION_monitor:
- monitor_parse(optarg);
+ monitor_parse(optarg, "readline");
+ default_monitor = 0;
+ break;
+ case QEMU_OPTION_qmp:
+ monitor_parse(optarg, "control");
default_monitor = 0;
break;
case QEMU_OPTION_mon:
@@ -5617,7 +5621,7 @@ int main(int argc, char **argv, char **envp)
if (default_serial)
add_device_config(DEV_SERIAL, "stdio");
if (default_monitor)
- monitor_parse("stdio");
+ monitor_parse("stdio", "readline");
}
} else {
if (default_serial)
@@ -5625,7 +5629,7 @@ int main(int argc, char **argv, char **envp)
if (default_parallel)
add_device_config(DEV_PARALLEL, "vc:80Cx24C");
if (default_monitor)
- monitor_parse("vc:80Cx24C");
+ monitor_parse("vc:80Cx24C", "readline");
}
if (default_vga)
vga_interface_type = VGA_CIRRUS;
--
1.6.5.2
- [Qemu-devel] [FOR 0.12 PATCH v4 13/22] default devices: vga adapter., (continued)
- [Qemu-devel] [FOR 0.12 PATCH v4 13/22] default devices: vga adapter., Gerd Hoffmann, 2009/12/08
- [Qemu-devel] [FOR 0.12 PATCH v4 17/22] un-static qemu_chr_parse_compat(), Gerd Hoffmann, 2009/12/08
- [Qemu-devel] [FOR 0.12 PATCH v4 19/22] add new -mon switch, Gerd Hoffmann, 2009/12/08
- [Qemu-devel] [FOR 0.12 PATCH v4 15/22] default devices: network, Gerd Hoffmann, 2009/12/08
- [Qemu-devel] [FOR 0.12 PATCH v4 21/22] default devices: virtio consoles., Gerd Hoffmann, 2009/12/08
- [Qemu-devel] [FOR 0.12 PATCH v4 22/22] Set default console to virtio on S390x, Gerd Hoffmann, 2009/12/08
- [Qemu-devel] [FOR 0.12 PATCH v4 20/22] add -qmp convinience switch,
Gerd Hoffmann <=
- [Qemu-devel] [FOR 0.12 PATCH v4 16/22] default devices: drives, Gerd Hoffmann, 2009/12/08
- [Qemu-devel] [FOR 0.12 PATCH v4 18/22] rework -monitor handling, switch to QemuOpts, Gerd Hoffmann, 2009/12/08
- [Qemu-devel] Re: [FOR 0.12 PATCH v4 01/22] default devices: qdev integration., Luiz Capitulino, 2009/12/08
- Re: [Qemu-devel] [FOR 0.12 PATCH v4 01/22] default devices: qdev integration., Markus Armbruster, 2009/12/10