From: Kevin Wolf Date: Thu, 12 May 2016 13:35:20 +0000 (+0200) Subject: Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-05-12' into queue... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=efc2645f714aae1bcf22e8165cad51c57f34fdf3;p=qemu.git Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-05-12' into queue-block Block patches for 2.7 # gpg: Signature made Thu May 12 15:34:13 2016 CEST using RSA key ID E838ACAD # gpg: Good signature from "Max Reitz " * mreitz/tags/pull-block-for-kevin-2016-05-12: qemu-iotests: iotests: fail hard if not run via "check" block: enable testing of LUKS driver with block I/O tests block: add support for encryption secrets in block I/O tests block: add support for --image-opts in block I/O tests qemu-io: Add 'write -z -u' to test MAY_UNMAP flag qemu-io: Add 'write -f' to test FUA flag qemu-io: Allow unaligned access by default qemu-io: Use bool for command line flags qemu-io: Make 'open' subcommand more like command line qemu-io: Add missing option documentation qmp: add monitor command to add/remove a child quorum: implement bdrv_add_child() and bdrv_del_child() Add new block driver interface to add/delete a BDS's child qemu-img: check block status of backing file when converting. iotests: fix the redirection order in 083 Signed-off-by: Kevin Wolf --- efc2645f714aae1bcf22e8165cad51c57f34fdf3