Failed in applying to current master (
apply log)
qapi/block-core.json | 44 +++-
qapi/block-export.json | 10 +-
include/block/block-common.h | 2 +-
include/block/block-global-state.h | 6 +
include/block/export.h | 3 +
include/system/block-backend-io.h | 7 +
migration/migration.h | 3 -
block.c | 64 +++++-
block/block-backend.c | 32 ++-
block/export/export.c | 29 ++-
block/monitor/block-hmp-cmds.c | 5 +-
block/qapi.c | 1 +
block/replication.c | 1 -
block/vpc.c | 65 +++---
blockdev.c | 48 ++++
blockjob.c | 2 -
hw/block/virtio-blk.c | 9 -
hw/scsi/virtio-scsi.c | 3 -
migration/block-active.c | 46 ----
migration/migration.c | 8 -
nbd/server.c | 17 ++
scripts/qemu-gdb.py | 2 +
scripts/qemugdb/coroutine.py | 102 ++++++---
tests/qemu-iotests/iotests.py | 8 +
tests/qemu-iotests/041 | 4 +-
tests/qemu-iotests/165 | 4 +-
tests/qemu-iotests/184.out | 2 +
tests/qemu-iotests/191.out | 16 ++
tests/qemu-iotests/273.out | 5 +
tests/qemu-iotests/tests/copy-before-write | 3 +-
tests/qemu-iotests/tests/inactive-node-nbd | 303 +++++++++++++++++++++++++
tests/qemu-iotests/tests/inactive-node-nbd.out | 239 +++++++++++++++++++
tests/qemu-iotests/tests/migrate-bitmaps-test | 7 +-
tests/qemu-iotests/tests/qsd-migrate | 140 ++++++++++++
tests/qemu-iotests/tests/qsd-migrate.out | 59 +++++
35 files changed, 1133 insertions(+), 166 deletions(-)
create mode 100755 tests/qemu-iotests/tests/inactive-node-nbd
create mode 100644 tests/qemu-iotests/tests/inactive-node-nbd.out
create mode 100755 tests/qemu-iotests/tests/qsd-migrate
create mode 100644 tests/qemu-iotests/tests/qsd-migrate.out