diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-19 09:23:16 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-19 09:23:16 -0600 |
| commit | b48c0134de96f3deed15a0e115d58f3cff09f3c1 (patch) | |
| tree | 2df65714d6e3282b5f6478264e2cc0c57ab7cfa2 /json-streamer.c | |
| parent | 5414b32542662976c364b58011c4841304569aff (diff) | |
| parent | 939a1cc399adb92640d156097d528b6471c136ae (diff) | |
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()
Diffstat (limited to 'json-streamer.c')
0 files changed, 0 insertions, 0 deletions