tree df518fd99409be22df46188174833b5fd317be5f
parent 70556264a89a268efba1d7e8e341adcdd7881eb4
parent a631892f9d6440812af98588e9635f1a2a7260ff
author Peter Maydell <peter.maydell@linaro.org> 1412011108 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1412011109 +0100

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>