mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -qmp convinience switch

Browse Source 
Acts like -monitor but switched into qmp mode.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-12-08 13:11:52 +01:00 committed by Anthony Liguori
parent 22a0e04b9b
commit 6ca5582d4f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qemu-options.hx
View File

@ -1588,6 +1588,8 @@ serial port).
The default device is @code{vc} in graphical mode and @code{stdio} in The default device is @code{vc} in graphical mode and @code{stdio} in
non graphical mode. non graphical mode.
ETEXI 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, \ DEF("mon", HAS_ARG, QEMU_OPTION_mon, \
"-mon chardev=[name][,mode=readline|control][,default]\n") "-mon chardev=[name][,mode=readline|control][,default]\n")

14
vl.c
View File

@ -4660,7 +4660,7 @@ static int mon_init_func(QemuOpts *opts, void *opaque)
return 0; 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; static int monitor_device_index = 0;
QemuOpts *opts; QemuOpts *opts;
@ -4690,7 +4690,7 @@ static void monitor_parse(const char *optarg)
fprintf(stderr, "duplicate chardev: %s\n", label); fprintf(stderr, "duplicate chardev: %s\n", label);
exit(1); exit(1);
} }
qemu_opt_set(opts, "mode", "readline"); qemu_opt_set(opts, "mode", mode);
qemu_opt_set(opts, "chardev", label); qemu_opt_set(opts, "chardev", label);
if (def) if (def)
qemu_opt_set(opts, "default", "on"); qemu_opt_set(opts, "default", "on");
@ -5281,7 +5281,11 @@ int main(int argc, char **argv, char **envp)
break; break;
} }
case QEMU_OPTION_monitor: 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; default_monitor = 0;
break; break;
case QEMU_OPTION_mon: case QEMU_OPTION_mon:
@ -5617,7 +5621,7 @@ int main(int argc, char **argv, char **envp)
if (default_serial) if (default_serial)
add_device_config(DEV_SERIAL, "stdio"); add_device_config(DEV_SERIAL, "stdio");
if (default_monitor) if (default_monitor)
monitor_parse("stdio"); monitor_parse("stdio", "readline");
} }
} else { } else {
if (default_serial) if (default_serial)
@ -5625,7 +5629,7 @@ int main(int argc, char **argv, char **envp)
if (default_parallel) if (default_parallel)
add_device_config(DEV_PARALLEL, "vc:80Cx24C"); add_device_config(DEV_PARALLEL, "vc:80Cx24C");
if (default_monitor) if (default_monitor)
monitor_parse("vc:80Cx24C"); monitor_parse("vc:80Cx24C", "readline");
} }
if (default_vga) if (default_vga)
vga_interface_type = VGA_CIRRUS; vga_interface_type = VGA_CIRRUS;