Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, Ronnie Sahlberg <ronniesahlberg@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Peter Lieven <pl@kamp.de>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, John Snow <jsnow@redhat.com>, Markus Armbruster <armbru@redhat.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>
docs/tools/qemu-img.rst | 2 +-
include/block/accounting.h | 6 +-
include/block/block-io.h | 1 -
include/block/block_int-io.h | 2 +-
include/hw/block/block.h | 7 +-
include/hw/ide/internal.h | 3 +
block/accounting.c | 26 +++-
block/file-posix.c | 24 +++-
block/gluster.c | 4 -
block/io.c | 44 +-----
block/iscsi.c | 2 +-
block/qcow2-bitmap.c | 2 +-
block/qcow2.c | 22 ++-
block/qed.c | 15 +-
block/raw-format.c | 4 +-
blockdev.c | 17 ++-
hw/block/block.c | 2 +
hw/ide/core.c | 35 ++++-
hw/ide/piix.c | 17 +--
qemu-img.c | 4 +-
tests/qtest/ide-test.c | 72 +++++++---
tests/qemu-iotests/172.out | 76 +++++++++++
tests/qemu-iotests/227.out | 4 +-
tests/qemu-iotests/tests/backing-file-invalidation | 152 +++++++++++++++++++++
.../tests/backing-file-invalidation.out | 5 +
25 files changed, 447 insertions(+), 101 deletions(-)
create mode 100755 tests/qemu-iotests/tests/backing-file-invalidation
create mode 100644 tests/qemu-iotests/tests/backing-file-invalidation.out