tree 5425e8ea2ced8436d764b2e789e764cdd502570c
parent 052bb77a47ce2508538d0e4c9a2fb4b9787a2267
parent 208c9d1b7c23e112d2fb83660fa23f2918c4c15b
author Anthony Liguori <aliguori@us.ibm.com> 1342640677 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1342640677 -0500

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