The following changes since commit d8e3b729cf452d2689c8669f1ec18158db29fd5a:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-06-11 15:33:38 +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 2db33f88d2b340c049c576ad75d442e4b6ffe768: qemu-iotests: expand test 093 to support group throttling (2015-06-12 14:00:00 +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 Kevin Wolf (1): raw-posix: Fix .bdrv_co_get_block_status() for unaligned image size Stefan Hajnoczi (1): Revert "iothread: release iothread around aio_poll" async.c | 8 +- block.c | 38 ++- block/Makefile.objs | 1 + block/io.c | 71 ++---- block/qapi.c | 8 +- block/raw-posix.c | 5 +- block/throttle-groups.c | 496 ++++++++++++++++++++++++++++++++++++++++ blockdev.c | 38 ++- hmp.c | 10 +- include/block/block.h | 3 +- include/block/block_int.h | 7 +- include/block/throttle-groups.h | 46 ++++ include/qemu/throttle.h | 46 ++-- iothread.c | 11 +- qapi/block-core.json | 29 ++- qemu-options.hx | 1 + qmp-commands.hx | 3 +- tests/qemu-iotests/093 | 89 ++++--- tests/test-aio.c | 19 +- tests/test-throttle.c | 163 +++++++++---- util/throttle.c | 81 ++++--- 21 files changed, 954 insertions(+), 219 deletions(-) create mode 100644 block/throttle-groups.c create mode 100644 include/block/throttle-groups.h -- 2.4.2