]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b100fcf 7aa939a)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:33:15 +0000 (13:33 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:33:15 +0000 (13:33 -0500)
* qmp/queue/qmp:
  migration: move total_time from ram stats to migration info
  monitor: avoid declaring unused variables
  qapi: Fix memory leak

1  2 
qapi-schema.json patch | diff1 | diff2 | blob | history
qmp-commands.hx patch | diff1 | diff2 | blob | history

diff --cc qapi-schema.json
Simple merge
diff --cc qmp-commands.hx
Simple merge
QEMU mirror