Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, John Snow <jsnow@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Peter Lieven <pl@dlhnet.de>, Alberto Garcia <berto@igalia.com>, Fam Zheng <fam@euphon.net>, Markus Armbruster <armbru@redhat.com>, "Dr. David Alan Gilbert" <dave@treblig.org>, Eric Blake <eblake@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, "Marc-André Lureau" <marcandre.lureau@redhat.com>
qapi/block-core.json | 7 +++-
include/block/block_int-common.h | 1 +
include/block/throttle-groups.h | 3 +-
block/curl.c | 11 ++----
block/mirror.c | 52 +++++++++++++++++-----------
block/monitor/block-hmp-cmds.c | 4 +--
block/nfs.c | 19 +++++-----
block/qapi.c | 8 ++---
block/qcow2.c | 75 ++++++++++++++++++++++++++++++++++++----
block/throttle-groups.c | 21 ++++-------
block/vmdk.c | 8 ++---
monitor/monitor.c | 21 ++++++++++-
tests/qemu-iotests/082.out | 18 ++++++++++
tests/qemu-iotests/244 | 71 +++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/244.out | 61 ++++++++++++++++++++++++++++++++
tests/qemu-iotests/common.filter | 2 +-
ui/cocoa.m | 2 +-
17 files changed, 309 insertions(+), 75 deletions(-)