From: Anthony Liguori Date: Fri, 27 Apr 2012 17:00:06 +0000 (-0500) Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a8b69b8e2431edfcb6c4cfb069787e9071d6235b;p=qemu.git 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() --- a8b69b8e2431edfcb6c4cfb069787e9071d6235b