From: Kevin Wolf Date: Mon, 25 Feb 2019 14:16:57 +0000 (+0100) Subject: Merge remote-tracking branch 'mreitz/tags/pull-block-2019-02-25' into queue-block X-Git-Tag: v4.0.0-rc0~78^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b967e9f348d48788a2ab481d45398b80ce71fa6;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'mreitz/tags/pull-block-2019-02-25' into queue-block Block patches: - Fix various issues with bdrv_refresh_filename() - Fix various iotests - Include LUKS overhead in qemu-img measure for qcow2 - A fix for vmdk's image creation interface # gpg: Signature made Mon Feb 25 15:13:43 2019 CET # gpg: using RSA key F407DB0061D5CF40 # gpg: Good signature from "Max Reitz " # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * mreitz/tags/pull-block-2019-02-25: (45 commits) iotests: Skip 211 on insufficient memory vmdk: false positive of compat6 with hwversion not set iotests: add LUKS payload overhead to 178 qemu-img measure test qcow2: include LUKS payload overhead in qemu-img measure iotests.py: s/_/-/g on keys in qmp_log() iotests: Let 045 be run concurrently iotests: Filter SSH paths iotests.py: Filter filename in any string value iotests.py: Add is_str() iotests: Fix 207 to use QMP filters for qmp_log iotests: Fix 232 for LUKS iotests: Remove superfluous rm from 232 iotests: Fix 237 for Python 2.x iotests: Re-add filename filters iotests: Test json:{} filenames of internal BDSs block: BDS options may lack the "driver" option block/null: Generate filename even with latency-ns block/curl: Implement bdrv_refresh_filename() block/curl: Harmonize option defaults block/nvme: Fix bdrv_refresh_filename() ... Signed-off-by: Kevin Wolf --- 1b967e9f348d48788a2ab481d45398b80ce71fa6