diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-10-18 15:16:11 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-10-18 15:16:11 -0200 |
| commit | 4ebd2711c3baa6a78d3a4521b146ac522c238d14 (patch) | |
| tree | 1e5c37a38a251521368d82b41874d0d7cb26d005 /qemu-config.c | |
| parent | 32bb25e8792d248db1836ae68edf8815cb1b75e5 (diff) | |
| parent | 30f5041ef1ba534af9308d840bf359a50597ba5d (diff) | |
Merge commit '30f5041ef1ba534af9308d840bf359a50597ba5d' into upstream-merge
* commit '30f5041ef1ba534af9308d840bf359a50597ba5d': (23 commits)
Monitor: Drop QMP info from the qemu-monitor.hx file
QMP: Small cleanup in handle_qmp_command()
QMP: Simplify do_info_commands()
QMP: Introduce query commands dispatch table
QMP: Introduce command dispatch table
QMP: Introduce qmp_find_cmd()
Monitor: Introduce the qmp-commands.hx file
Monitor: Convert do_info() back to HMP
Monitor: Drop is_async_return()
Monitor: Drop QMP bits from do_info()
QMP: Don't use do_info()
QMP: handle_qmp_command(): Move 'cmd' sanity check
Monitor: Introduce search_dispatch_table()
disable guest-provided stats on "info balloon" command
Add option to turn on JSON pretty printing in monitor
Add support for JSON pretty printing
powerpc: Add a virtex5 ml507 refdesign board
powerpc: Add a ppc-440x5 Xilinx model
tap: Remove double include of util.h
pulse-audio: fix bug on updating rpos
...
Conflicts:
qemu-monitor.hx
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-config.c')
| -rw-r--r-- | qemu-config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c index a2ab5571a..e8e3b2266 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -287,6 +287,9 @@ static QemuOptsList qemu_mon_opts = { },{ .name = "default", .type = QEMU_OPT_BOOL, + },{ + .name = "pretty", + .type = QEMU_OPT_BOOL, }, { /* end of list */ } }, |