diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-07 10:47:43 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-07 10:47:43 +0200 |
| commit | 6c94243272c3fa3f46514d1e30c33145d28d73eb (patch) | |
| tree | f5168fdc6550a69c202f96730ac000de97a83d82 /qemu-options.hx | |
| parent | Merge commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa' into upstream-merge (diff) | |
| parent | QMP: Initial support (diff) | |
| download | qemu-kvm-6c94243272c3fa3f46514d1e30c33145d28d73eb.tar.gz qemu-kvm-6c94243272c3fa3f46514d1e30c33145d28d73eb.tar.bz2 qemu-kvm-6c94243272c3fa3f46514d1e30c33145d28d73eb.zip | |
Merge commit '9b57c02e3e14163b576ada77ddd1d7b346a6e421' into upstream-merge
* commit '9b57c02e3e14163b576ada77ddd1d7b346a6e421':
QMP: Initial support
QError: Add errors needed by QMP
monitor: Introduce 'info commands'
monitor: Rename monitor_handle_command()
monitor: Introduce monitor_find_command()
monitor: Introduce monitor_call_handler()
monitor: Command-line flag to enable control mode
monitor: Introduce MONITOR_USE_CONTROL flag
monitor: do_info_balloon(): Use QError
QError: Add QERR_KVM_MISSING_CAP
QError: Add QERR_DEVICE_NOT_ACTIVE
qdev: Use QError for 'device not found' error
QError: Add QERR_DEVICE_NOT_FOUND
Conflicts:
monitor.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 8d46da4aa..fff751b01 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1578,13 +1578,14 @@ Use @code{-parallel none} to disable all parallel ports. ETEXI DEF("monitor", HAS_ARG, QEMU_OPTION_monitor, \ - "-monitor dev redirect the monitor to char device 'dev'\n") + "-monitor [control,]dev redirect the monitor to char device 'dev'\n") STEXI -@item -monitor @var{dev} +@item -monitor [@var{control},]@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, \ |