Failed in applying to current master (
apply log)
qapi/block-core.json | 7 +
block/vhdx.h | 12 +-
include/block/block.h | 5 +-
include/qemu/option.h | 2 +-
include/qemu/units.h | 18 +
include/sysemu/block-backend.h | 6 +-
block.c | 60 ++-
block/block-backend.c | 8 +-
block/bochs.c | 17 +-
block/cloop.c | 16 +-
block/curl.c | 8 +-
block/dmg.c | 16 +-
block/file-posix.c | 19 +-
block/gluster.c | 12 +-
block/iscsi.c | 8 +-
block/nbd-client.c | 10 +-
block/qcow.c | 18 +-
block/qcow2-bitmap.c | 24 +-
block/qcow2.c | 66 +--
block/quorum.c | 45 +-
block/rbd.c | 14 +-
block/vdi.c | 68 +--
block/vhdx-endian.c | 118 ++---
block/vhdx-log.c | 4 +-
block/vhdx.c | 18 +-
block/vpc.c | 2 +
block/vvfat.c | 15 +-
blockdev.c | 3 +-
chardev/char.c | 2 +-
crypto/block-qcow.c | 2 +
qdev-monitor.c | 13 +-
qemu-img.c | 4 +-
qemu-io-cmds.c | 4 +-
util/qemu-option.c | 32 +-
vl.c | 15 +-
tests/qemu-iotests/081 | 116 +++++
tests/qemu-iotests/081.out | 70 +++
tests/qemu-iotests/082.out | 956 ++++++++++++++++++++---------------------
tests/qemu-iotests/083 | 2 +-
tests/qemu-iotests/232 | 147 +++++++
tests/qemu-iotests/232.out | 59 +++
tests/qemu-iotests/group | 1 +
42 files changed, 1266 insertions(+), 776 deletions(-)
create mode 100755 tests/qemu-iotests/232
create mode 100644 tests/qemu-iotests/232.out