The following changes since commit 8cb41fda78c7ebde0dd248c6afe1d336efb0de50:
Merge remote-tracking branch 'remotes/philmd/tags/machine-20211101' into staging (2021-11-02 05:53:45 -0400) are available in the Git repository at: https://github.com/XanClic/qemu.git tags/pull-block-2021-11-02 for you to fetch changes up to 7da9623cc078229caf07c290e16401ccdb9408d2: block/vpc: Add a sanity check that fixed-size images have the right type (2021-11-02 12:47:51 +0100) ---------------------------------------------------------------- Emanuele Giuseppe Esposito (1): pylint: fix errors and warnings generated by tests/qemu-iotests/297 Eric Blake (1): qemu-img: Consistent docs for convert -F Thomas Huth (1): block/vpc: Add a sanity check that fixed-size images have the right type Thomas Weißschuh (1): vmdk: allow specification of tools version docs/tools/qemu-img.rst | 2 +- qapi/block-core.json | 3 +++ block/vmdk.c | 24 ++++++++++++++++++++---- block/vpc.c | 3 ++- qemu-img-cmds.hx | 2 +- tests/qemu-iotests/129 | 18 +++++++++--------- tests/qemu-iotests/310 | 16 ++++++++-------- tests/qemu-iotests/check | 11 ++++++----- tests/qemu-iotests/iotests.py | 7 ++++--- tests/qemu-iotests/tests/image-fleecing | 4 ++-- 10 files changed, 56 insertions(+), 34 deletions(-) -- 2.31.1