The following changes since commit 89e4a51ca9546a7bbe1998c4e3d4a3ac3a0c19be:
Merge remote-tracking branch 'stefanha/tags/tracing-pull-request' into staging (2014-01-31 11:13:08 +0000) are available in the git repository at: git://github.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 1b7650ef2f63d53cf89af25a9f323323cf2423a7: qemu-iotests: only run 071 on qcow2 (2014-01-31 22:05:03 +0100) ---------------------------------------------------------------- Block pull request ---------------------------------------------------------------- Daniel P. Berrange (1): Describe flaws in qcow/qcow2 encryption in the docs Fam Zheng (1): qemu-iotests: Drop assert_no_active_commit in case 040 Jeff Cody (2): block: remove QED .bdrv_make_empty implementation block: remove qcow2 .bdrv_make_empty implementation Markus Armbruster (2): block/vhdx: Error checking fixes dataplane: Comment fix Peter Lieven (1): block/vmdk: add basic .bdrv_check support Stefan Hajnoczi (1): qemu-iotests: only run 071 on qcow2 block/qcow2.c | 21 ------------------ block/qed.c | 6 ------ block/vhdx-log.c | 4 ++-- block/vhdx.c | 8 +++---- block/vmdk.c | 48 +++++++++++++++++++++++++++++++++++++++++ hw/block/dataplane/virtio-blk.c | 2 +- qemu-doc.texi | 23 +++++++++++++++++--- qemu-img.texi | 23 +++++++++++++++++--- tests/qemu-iotests/040 | 28 +++++++++++------------- tests/qemu-iotests/071 | 2 +- 10 files changed, 108 insertions(+), 57 deletions(-) -- 1.8.5.3