Merge remote-tracking branch 'qmp/queue/qmp' into staging
commit86759aa89d1307d0dda2435cc25943bcd7026686
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:33:15 +0000 (22 13:33 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:33:15 +0000 (22 13:33 -0500)
tree364644e9ddb68e73f3ce4eda3a9e56f591cb10e6
parentb100fcfe4966aa41d4d6908d0c4c510bcf8f82dd
parent7aa939af39e20eeca98fced59708a87c64267f54
Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  migration: move total_time from ram stats to migration info
  monitor: avoid declaring unused variables
  qapi: Fix memory leak
qapi-schema.json
qmp-commands.hx