From: Richard Henderson Date: Wed, 3 Nov 2021 02:51:34 +0000 (-0400) Subject: Merge remote-tracking branch 'remotes/XanClic/tags/pull-block-2021-11-02' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=22d5760cb43e2fe73e61fda145a98f3217ca47bf;p=qemu.git Merge remote-tracking branch 'remotes/XanClic/tags/pull-block-2021-11-02' into staging Block patches: - Add "toolsversion" creation option for vmdk images - iotest fix (297, the linting test) - Added sanity check when opening vpc images - Doc fix # gpg: Signature made Tue 02 Nov 2021 10:14:52 AM EDT # gpg: using RSA key CB62D7A0EE3829E45F004D34A1FA40D098019CDF # gpg: issuer "hreitz@redhat.com" # gpg: Good signature from "Hanna Reitz " [marginal] # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: CB62 D7A0 EE38 29E4 5F00 4D34 A1FA 40D0 9801 9CDF * remotes/XanClic/tags/pull-block-2021-11-02: block/vpc: Add a sanity check that fixed-size images have the right type vmdk: allow specification of tools version pylint: fix errors and warnings generated by tests/qemu-iotests/297 qemu-img: Consistent docs for convert -F Signed-off-by: Richard Henderson --- 22d5760cb43e2fe73e61fda145a98f3217ca47bf