]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 052bb77 208c9d1)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 18 Jul 2012 19:44:37 +0000 (14:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 18 Jul 2012 19:44:37 +0000 (14:44 -0500)
* qmp/queue/qmp:
  qapi: Convert getfd and closefd
  qapi: input_type_enum(): fix error message
  qmp: dump-guest-memory: improve schema doc

1  2 
monitor.c patch | diff1 | diff2 | blob | history

diff --cc monitor.c
Simple merge
Qemu copy for testing