Failed in applying to current master (
apply log)
qapi/block-core.json | 66 +++-
include/block/block.h | 1 -
include/block/block_int.h | 56 ++-
include/block/throttle-groups.h | 52 ++-
include/qemu/throttle-options.h | 60 +++-
include/qemu/throttle.h | 3 +
include/sysemu/block-backend.h | 20 +-
block.c | 35 +-
block/blkdebug.c | 20 +-
block/block-backend.c | 62 ++--
block/commit.c | 12 +-
block/io.c | 26 ++
block/mirror.c | 12 +-
block/qapi.c | 8 +-
block/qcow.c | 153 ++++----
block/qcow2.c | 16 +-
block/raw-format.c | 6 -
block/throttle-groups.c | 750 ++++++++++++++++++++++++++++++----------
block/throttle.c | 237 +++++++++++++
blockdev.c | 4 +-
tests/test-throttle.c | 111 +++---
util/throttle.c | 151 ++++++++
block/Makefile.objs | 1 +
tests/qemu-iotests/184 | 205 +++++++++++
tests/qemu-iotests/184.out | 302 ++++++++++++++++
tests/qemu-iotests/group | 1 +
26 files changed, 1917 insertions(+), 453 deletions(-)
create mode 100644 block/throttle.c
create mode 100755 tests/qemu-iotests/184
create mode 100644 tests/qemu-iotests/184.out