The following changes since commit 3b730f570c5872ceea2137848f1d4554d4847441:
Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2015-06-04 14:04:14 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 1ad69e1128519a970a9fdf0203a67ab4bc18eb68: qemu-iotests: expand test 093 to support group throttling (2015-06-05 11:03:07 +0100) ---------------------------------------------------------------- ---------------------------------------------------------------- Alberto Garcia (7): throttle: Add throttle group infrastructure throttle: Add throttle group infrastructure tests throttle: Add throttle group support throttle: acquire the ThrottleGroup lock in bdrv_swap() throttle: add the name of the ThrottleGroup to BlockDeviceInfo throttle: Update throttle infrastructure copyright qemu-iotests: expand test 093 to support group throttling Benoît Canet (1): throttle: Extract timers from ThrottleState into a separate structure Fam Zheng (8): block: Add bdrv_get_block_status_above qmp: Add optional bool "unmap" to drive-mirror mirror: Do zero write on target if sectors not allocated block: Fix dirty bitmap in bdrv_co_discard block: Remove bdrv_reset_dirty qemu-iotests: Make block job methods common qemu-iotests: Add test case for mirror with unmap iotests: Use event_wait in wait_ready Stefan Hajnoczi (1): Revert "iothread: release iothread around aio_poll" async.c | 8 +- block.c | 50 ++-- block/Makefile.objs | 1 + block/io.c | 131 +++++------ block/mirror.c | 27 ++- block/qapi.c | 8 +- block/throttle-groups.c | 496 ++++++++++++++++++++++++++++++++++++++++ blockdev.c | 43 +++- hmp.c | 12 +- include/block/block.h | 7 +- include/block/block_int.h | 11 +- include/block/throttle-groups.h | 46 ++++ include/qemu/throttle.h | 46 ++-- iothread.c | 11 +- qapi/block-core.json | 37 ++- qemu-options.hx | 1 + qmp-commands.hx | 6 +- tests/qemu-iotests/041 | 66 ++---- tests/qemu-iotests/093 | 89 ++++--- tests/qemu-iotests/132 | 59 +++++ tests/qemu-iotests/132.out | 5 + tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 23 ++ tests/test-aio.c | 19 +- tests/test-throttle.c | 161 +++++++++---- util/throttle.c | 81 ++++--- 26 files changed, 1144 insertions(+), 301 deletions(-) create mode 100644 block/throttle-groups.c create mode 100644 include/block/throttle-groups.h create mode 100644 tests/qemu-iotests/132 create mode 100644 tests/qemu-iotests/132.out -- 2.4.2
