Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
commitb60a7726cc0f5cbb2aecdbba67aeaf54ffc2c9cf
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 29 Sep 2014 17:18:28 +0000 (29 18:18 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 29 Sep 2014 17:18:29 +0000 (29 18:18 +0100)
treedf518fd99409be22df46188174833b5fd317be5f
parent70556264a89a268efba1d7e8e341adcdd7881eb4
parenta631892f9d6440812af98588e9635f1a2a7260ff
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  Add HMP command "info memory-devices"
  qemu-socket: Eliminate silly QERR_ macros
  qemu-socket: Polish errors for connect() and listen() failure
  qemu-iotests: Test missing "driver" key for blockdev-add
  tests: add QMP input visitor test for unions with no discriminator
  qapi: dealloc visitor, implement visit_start_union
  qapi: add visit_start_union and visit_end_union
  virtio-balloon: fix integer overflow in memory stats feature
  monitor: Reset HMP mon->rs in CHR_EVENT_OPEN

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
tests/qemu-iotests/087.out