First part is fixing discard in combination with -blockdev. The option
needs to be set for the whole throttle->fmt->file chain to make it
work.
Second part is fixing bug #6543, qcow2 can grow beyond what qemu-img
measure reports, because of fragmentation when the discard-no-unref
option is not used.
There is a fix-6543 branch on my staff repo, should the patches
touching tests be messed up again because of the overly long line in
the expected test output.
Fiona Ebner (6):
blockdev: helper to add common options
blockdev: fix discard
tests: image convert: avoid hard-coded VM ID in result
tests: image convert: properly set snapshot-as-volume-chain option
tests: image convert: add tests where storages with
'snapshot-as-volume-chain' are the target
fix #6543: use qcow2 'discard-no-unref' option when using
snapshot-as-volume-chain
src/PVE/QemuServer/Blockdev.pm | 36 +++++++++----
src/PVE/QemuServer/QemuImage.pm | 19 +++++++
src/test/cfg2cmd/aio.conf.cmd | 28 +++++-----
src/test/cfg2cmd/bootorder-empty.conf.cmd | 6 +--
src/test/cfg2cmd/bootorder-legacy.conf.cmd | 6 +--
src/test/cfg2cmd/bootorder.conf.cmd | 6 +--
...putype-icelake-client-deprecation.conf.cmd | 2 +-
.../cfg2cmd/efi-ovmf-without-efidisk.conf.cmd | 2 +-
src/test/cfg2cmd/efi-raw-template.conf.cmd | 2 +-
src/test/cfg2cmd/efi-raw.conf.cmd | 2 +-
.../cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd | 2 +-
src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd | 2 +-
src/test/cfg2cmd/efidisk-on-rbd.conf.cmd | 2 +-
src/test/cfg2cmd/ide.conf.cmd | 2 +-
src/test/cfg2cmd/q35-ide.conf.cmd | 2 +-
.../q35-linux-hostpci-mapping.conf.cmd | 2 +-
.../q35-linux-hostpci-multifunction.conf.cmd | 2 +-
.../q35-linux-hostpci-template.conf.cmd | 4 +-
...q35-linux-hostpci-x-pci-overrides.conf.cmd | 2 +-
src/test/cfg2cmd/q35-linux-hostpci.conf.cmd | 2 +-
src/test/cfg2cmd/q35-simple.conf.cmd | 2 +-
src/test/cfg2cmd/seabios_serial.conf.cmd | 2 +-
src/test/cfg2cmd/sev-es.conf.cmd | 2 +-
src/test/cfg2cmd/sev-std.conf.cmd | 2 +-
src/test/cfg2cmd/simple-backingchain.conf.cmd | 4 +-
src/test/cfg2cmd/simple-btrfs.conf.cmd | 8 +--
src/test/cfg2cmd/simple-cifs.conf.cmd | 8 +--
.../cfg2cmd/simple-disk-passthrough.conf.cmd | 4 +-
src/test/cfg2cmd/simple-lvm.conf.cmd | 8 +--
src/test/cfg2cmd/simple-lvmthin.conf.cmd | 8 +--
src/test/cfg2cmd/simple-rbd.conf.cmd | 16 +++---
src/test/cfg2cmd/simple-virtio-blk.conf.cmd | 2 +-
.../cfg2cmd/simple-zfs-over-iscsi.conf.cmd | 8 +--
src/test/cfg2cmd/simple1-template.conf.cmd | 4 +-
src/test/cfg2cmd/simple1.conf.cmd | 2 +-
src/test/run_qemu_img_convert_tests.pl | 54 ++++++++++++++++++-
36 files changed, 176 insertions(+), 89 deletions(-)
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
