]> git.proxmox.com Git - qemu.git/commit
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)
commit513e6bde4fa551c293e7d346e27b618b57a4087a
tree5425e8ea2ced8436d764b2e789e764cdd502570c
parent052bb77a47ce2508538d0e4c9a2fb4b9787a2267
parent208c9d1b7c23e112d2fb83660fa23f2918c4c15b
Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  qapi: Convert getfd and closefd
  qapi: input_type_enum(): fix error message
  qmp: dump-guest-memory: improve schema doc
monitor.c