The following changes since commit 0dcee62261cb044339b10e4bda1f67ef7dc82803:
Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-7' into staging (2016-03-14 13:51:21 +0000) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 0d611402a1e53a968a03c7c5e2f87114be92a319: Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-03-14-v2' into queue-block (2016-03-14 17:36:31 +0100) ---------------------------------------------------------------- Block layer patches ---------------------------------------------------------------- Alberto Garcia (4): quorum: Fix crash in quorum_aio_cb() monitor: Separate QUORUM_REPORT_BAD events according to the node name monitor: Use QEMU_CLOCK_VIRTUAL for the event queue in qtest mode iotests: Add test for QMP event rates Changlong Xie (3): docs: fix invalid node name in qmp event qmp event: Refactor QUORUM_REPORT_BAD quorum: modify vote rules for flush operation Fam Zheng (8): vmdk: Switch to heap arrays for vmdk_write_cid vmdk: Switch to heap arrays for vmdk_read_cid vmdk: Switch to heap arrays for vmdk_parent_open backup: Use Bitmap to replace "s->bitmap" block: Include hbitmap.h in block.h typedefs: Add BdrvDirtyBitmap block: Move block dirty bitmap code to separate files block: Remove unused typedef of BlockDriverDirtyHandler Jeff Cody (4): block/vpc: choose size calculation method based on creator_app field block/vpc: tests for auto-detecting VPC and Hyper-V VHD images block/vpc: give option to force the current_size field in .bdrv_create block/vpc: add tests for image creation force_size parameter Kevin Wolf (20): block/qapi: Factor out bdrv_query_blk_stats() block/qapi: Factor out bdrv_query_bds_stats() block/qapi: Include empty drives in query-blockstats blockdev: Snapshotting must not open second instance of old top block: Fix snapshot=on cache modes block: Fix cache mode defaults in bds_tree_init() hmp: 'drive_add -n' for creating a node without BB hmp: Extend drive_del to delete nodes without BB block: Use writeback in .bdrv_create() implementations block: Introduce blk_set_allow_write_beyond_eof() parallels: Use BB functions in .bdrv_create() qcow: Use BB functions in .bdrv_create() qcow2: Use BB functions in .bdrv_create() qed: Use BB functions in .bdrv_create() sheepdog: Use BB functions in .bdrv_create() vdi: Use BB functions in .bdrv_create() vhdx: Use BB functions in .bdrv_create() vmdk: Use BB functions in .bdrv_create() vpc: Use BB functions in .bdrv_create() Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-03-14-v2' into queue-block Max Reitz (1): iotests: Correct 081's reference output Paolo Bonzini (1): qemu-img: eliminate memory leak block.c | 396 ++------------------- block/Makefile.objs | 2 +- block/backup.c | 11 +- block/block-backend.c | 23 +- block/dirty-bitmap.c | 387 ++++++++++++++++++++ block/parallels.c | 24 +- block/qapi.c | 178 +++++---- block/qcow.c | 24 +- block/qcow2.c | 61 ++-- block/qed.c | 28 +- block/quorum.c | 50 ++- block/sheepdog.c | 41 ++- block/vdi.c | 22 +- block/vhdx.c | 28 +- block/vmdk.c | 121 ++++--- block/vpc.c | 165 +++++++-- blockdev.c | 60 +++- device-hotplug.c | 7 + docs/qmp-events.txt | 11 +- hmp-commands.hx | 4 +- include/block/block.h | 41 +-- include/block/block_int.h | 2 + include/block/dirty-bitmap.h | 44 +++ include/qemu/typedefs.h | 1 + include/sysemu/block-backend.h | 1 + monitor.c | 22 +- qapi/block.json | 16 + qapi/event.json | 4 +- qemu-img.c | 9 +- tests/qemu-iotests/081.out | 2 +- tests/qemu-iotests/146 | 165 +++++++++ tests/qemu-iotests/146.out | 70 ++++ tests/qemu-iotests/148 | 129 +++++++ tests/qemu-iotests/148.out | 5 + tests/qemu-iotests/group | 2 + .../sample_images/d2v-zerofilled.vhd.bz2 | Bin 0 -> 1021 bytes .../sample_images/hyperv2012r2-dynamic.vhd.bz2 | Bin 0 -> 214 bytes .../sample_images/virtualpc-dynamic.vhd.bz2 | Bin 0 -> 212 bytes 38 files changed, 1450 insertions(+), 706 deletions(-) create mode 100644 block/dirty-bitmap.c create mode 100644 include/block/dirty-bitmap.h create mode 100755 tests/qemu-iotests/146 create mode 100644 tests/qemu-iotests/146.out create mode 100644 tests/qemu-iotests/148 create mode 100644 tests/qemu-iotests/148.out create mode 100644 tests/qemu-iotests/sample_images/d2v-zerofilled.vhd.bz2 create mode 100644 tests/qemu-iotests/sample_images/hyperv2012r2-dynamic.vhd.bz2 create mode 100644 tests/qemu-iotests/sample_images/virtualpc-dynamic.vhd.bz2