commit | a8b69b8e2431edfcb6c4cfb069787e9071d6235b | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Fri Apr 27 12:00:06 2012 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Fri Apr 27 12:00:06 2012 -0500 |
tree | 5f6467e5b76c456625ef7b15f44fb9ff81dff8d6 | |
parent | a75bfc5fdda8b87ff969d68e020ffdf1008751b1 [diff] | |
parent | b3c83a2265261594d0a24507a17ad2f5c83eea81 [diff] |
Merge remote-tracking branch 'qmp/queue/qmp' into staging * qmp/queue/qmp: qapi: fix qmp_balloon() conversion qemu-iotests: add block-stream speed value test case block: add 'speed' optional parameter to block-stream block: change block-job-set-speed argument from 'value' to 'speed' block: use Error mechanism instead of -errno for block_job_set_speed() block: use Error mechanism instead of -errno for block_job_create()