Merge commit '30f5041ef1ba534af9308d840bf359a50597ba5d' into upstream-merge
commit4ebd2711c3baa6a78d3a4521b146ac522c238d14
authorMarcelo Tosatti <mtosatti@redhat.com>
Mon, 18 Oct 2010 17:16:11 +0000 (18 15:16 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Mon, 18 Oct 2010 17:16:11 +0000 (18 15:16 -0200)
tree1e5c37a38a251521368d82b41874d0d7cb26d005
parent32bb25e8792d248db1836ae68edf8815cb1b75e5
parent30f5041ef1ba534af9308d840bf359a50597ba5d
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>
Makefile
Makefile.objs
Makefile.target
configure
hw/virtio-balloon.c
monitor.c
qemu-config.c
qemu-monitor.hx
target-ppc/cpu.h
vl.c