Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 19 Jan 2012 15:23:16 +0000 (09:23 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 19 Jan 2012 15:23:16 +0000 (09:23 -0600)
commitb48c0134de96f3deed15a0e115d58f3cff09f3c1
tree2df65714d6e3282b5f6478264e2cc0c57ab7cfa2
parent5414b32542662976c364b58011c4841304569aff
parent939a1cc399adb92640d156097d528b6471c136ae
Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  block: use proper qerrors in qmp_block_resize
  qerror: restore alphabetical order over qerrors
  qerror: add check-qerror.sh to verify alphabetical order
  qmp: Add missing gcc format attribute and fix format string
  qapi: Convert block_set_io_throttle
  qapi: Convert change
  qerror: Extend QERR_DEVICE_ENCRYPTED
  qapi: Introduce change-vnc-password
  monitor: expose readline state
  qapi: Convert eject
  block: eject_device(): Use error_set()
  qapi: Convert expire_password
  qapi: Convert set_password
  vnc: Simplify vnc_display_password()