Changes in v3: * re-add patches for PVE 9 * rebase on current master The single-letter suffixes are ambiguous and especially in the context of disks, the powers of ten are usually used. Proxmox VE uses multiples of 1024 however. By adapting format_size() to use the verbose suffixes all newly written or re-written sizes will use the more verbose/explicit suffix.
The single-letter suffixes stay supported for backwards-compatibility for API/CLI users as well as parsing backup configurations. The function is currently also used for parsing the 'target-size' Ceph pool option (still restricted via schema to single-letter suffixes). Patches common 1/6 and manager 3/6 can be applied independently from the rest and at least common 1/6 should be applied to Proxmox VE 8 too. The d/control version bumps will need to be adapted to the actual version when the series gets applied. common: Fiona Ebner (2): schema: support sizes with verbose suffixes {K,M,G,T}iB fix #3900: schema: prefer sizes with verbose suffixes {K,M,G,T}iB src/PVE/JSONSchema.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) manager: Fiona Ebner (2): vzdump: use verbose size suffix when logging archive file size test: adapt tests to use verbose disk size suffixes PVE/VZDump.pm | 8 ++++---- debian/control | 2 +- test/replication_test1.pl | 2 +- test/replication_test2.pl | 2 +- test/replication_test3.pl | 2 +- test/replication_test4.pl | 2 +- test/replication_test5.pl | 4 ++-- test/replication_test6.pl | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) qemu-server: Fiona Ebner (2): test: fix tests for changes when printing disk size suffix test: adapt all tests to use verbose disk size suffixes debian/control | 2 +- src/test/cfg2cmd/bootorder-empty.conf | 6 +- src/test/cfg2cmd/bootorder-legacy.conf | 6 +- src/test/cfg2cmd/bootorder.conf | 6 +- .../cputype-icelake-client-deprecation.conf | 2 +- src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf | 4 +- src/test/cfg2cmd/efi-secboot-and-tpm.conf | 4 +- src/test/cfg2cmd/efidisk-on-rbd.conf | 2 +- src/test/cfg2cmd/i440fx-win10-hostpci.conf | 2 +- src/test/cfg2cmd/ide-no-media-error.conf | 10 +-- src/test/cfg2cmd/ide.conf | 10 +-- src/test/cfg2cmd/pinned-version-pxe-pve.conf | 2 +- src/test/cfg2cmd/pinned-version-pxe.conf | 2 +- src/test/cfg2cmd/pinned-version.conf | 2 +- src/test/cfg2cmd/q35-ide.conf | 10 +-- .../cfg2cmd/q35-linux-hostpci-mapping.conf | 2 +- .../q35-linux-hostpci-multifunction.conf | 2 +- .../cfg2cmd/q35-linux-hostpci-template.conf | 6 +- .../q35-linux-hostpci-x-pci-overrides.conf | 2 +- src/test/cfg2cmd/q35-linux-hostpci.conf | 2 +- src/test/cfg2cmd/q35-simple-6.0.conf | 2 +- src/test/cfg2cmd/q35-simple-7.0.conf | 2 +- src/test/cfg2cmd/q35-simple-pinned-6.1.conf | 2 +- src/test/cfg2cmd/q35-simple.conf | 2 +- src/test/cfg2cmd/q35-win10-hostpci.conf | 2 +- src/test/cfg2cmd/seabios_serial.conf | 2 +- src/test/cfg2cmd/sev-es.conf | 2 +- src/test/cfg2cmd/sev-std.conf | 2 +- .../simple-balloon-free-page-reporting.conf | 2 +- src/test/cfg2cmd/simple-btrfs.conf | 8 +- src/test/cfg2cmd/simple-rbd.conf | 16 ++-- src/test/cfg2cmd/simple-virtio-blk.conf | 2 +- src/test/cfg2cmd/simple-zfs-over-iscsi.conf | 8 +- src/test/cfg2cmd/simple1-template.conf | 4 +- src/test/cfg2cmd/simple1.conf | 2 +- .../unsupported-storage-content-type.conf | 2 +- .../cloudinit-snapshot.conf | 4 +- .../duplicate-sections.conf | 4 +- .../unknown-sections.conf | 4 +- .../verify-snapshot.conf | 4 +- .../cloudinit-snapshot.conf | 4 +- .../duplicate-sections.conf | 6 +- .../parse-config-input/fleecing-section.conf | 2 +- src/test/parse-config-input/locked.conf | 2 +- src/test/parse-config-input/plain.conf | 2 +- .../parse-config-input/regular-vm-efi.conf | 4 +- src/test/parse-config-input/sections.conf | 4 +- src/test/parse-config-input/snapshots.conf | 84 ++++++++--------- .../parse-config-input/unknown-sections.conf | 4 +- .../parse-config-input/verify-snapshot.conf | 4 +- src/test/restore-config-expected/139.conf | 4 +- src/test/restore-config-expected/140.conf | 18 ++++ src/test/restore-config-expected/142.conf | 2 +- src/test/restore-config-expected/1422.conf | 2 +- src/test/restore-config-expected/179.conf | 10 +-- src/test/restore-config-input/139.conf | 4 +- src/test/restore-config-input/140.conf | 22 +++++ src/test/restore-config-input/142.conf | 2 +- src/test/restore-config-input/1422.conf | 2 +- src/test/restore-config-input/179.conf | 10 +-- src/test/run_qemu_migrate_tests.pl | 90 +++++++++---------- src/test/run_qemu_restore_config_tests.pl | 2 +- .../commit/qemu-server/101.conf | 4 +- .../commit/qemu-server/102.conf | 6 +- .../commit/qemu-server/201.conf | 6 +- .../commit/qemu-server/202.conf | 6 +- .../commit/qemu-server/203.conf | 6 +- .../create/qemu-server/101.conf | 4 +- .../create/qemu-server/102.conf | 4 +- .../create/qemu-server/103.conf | 6 +- .../create/qemu-server/104.conf | 6 +- .../create/qemu-server/105.conf | 12 +-- .../create/qemu-server/106.conf | 4 +- .../create/qemu-server/201.conf | 2 +- .../create/qemu-server/202.conf | 6 +- .../create/qemu-server/203.conf | 2 +- .../create/qemu-server/301.conf | 4 +- .../create/qemu-server/302.conf | 4 +- .../create/qemu-server/303.conf | 2 +- .../delete/qemu-server/101.conf | 2 +- .../delete/qemu-server/102.conf | 4 +- .../delete/qemu-server/103.conf | 4 +- .../delete/qemu-server/104.conf | 6 +- .../delete/qemu-server/105.conf | 4 +- .../delete/qemu-server/106.conf | 6 +- .../delete/qemu-server/201.conf | 6 +- .../delete/qemu-server/202.conf | 10 +-- .../delete/qemu-server/203.conf | 4 +- .../delete/qemu-server/204.conf | 4 +- .../prepare/qemu-server/101.conf | 4 +- .../prepare/qemu-server/102.conf | 4 +- .../prepare/qemu-server/103.conf | 6 +- .../prepare/qemu-server/104.conf | 6 +- .../prepare/qemu-server/200.conf | 2 +- .../prepare/qemu-server/201.conf | 4 +- .../prepare/qemu-server/202.conf | 2 +- .../prepare/qemu-server/300.conf | 2 +- .../rollback/qemu-server/101.conf | 4 +- .../rollback/qemu-server/102.conf | 6 +- .../rollback/qemu-server/103.conf | 6 +- .../rollback/qemu-server/104.conf | 8 +- .../rollback/qemu-server/105.conf | 12 +-- .../rollback/qemu-server/106.conf | 4 +- .../rollback/qemu-server/201.conf | 4 +- .../rollback/qemu-server/202.conf | 4 +- .../rollback/qemu-server/203.conf | 4 +- .../rollback/qemu-server/204.conf | 4 +- .../rollback/qemu-server/205.conf | 4 +- .../rollback/qemu-server/206.conf | 12 +-- .../rollback/qemu-server/207.conf | 12 +-- .../rollback/qemu-server/301.conf | 4 +- .../rollback/qemu-server/302.conf | 4 +- .../rollback/qemu-server/303.conf | 4 +- .../commit/qemu-server/101.conf | 4 +- .../commit/qemu-server/102.conf | 6 +- .../commit/qemu-server/201.conf | 6 +- .../commit/qemu-server/202.conf | 6 +- .../commit/qemu-server/203.conf | 6 +- .../create/qemu-server/101.conf | 2 +- .../create/qemu-server/102.conf | 2 +- .../create/qemu-server/103.conf | 4 +- .../create/qemu-server/104.conf | 4 +- .../create/qemu-server/105.conf | 6 +- .../create/qemu-server/106.conf | 2 +- .../create/qemu-server/201.conf | 2 +- .../create/qemu-server/202.conf | 6 +- .../create/qemu-server/203.conf | 2 +- .../create/qemu-server/301.conf | 2 +- .../create/qemu-server/302.conf | 2 +- .../create/qemu-server/303.conf | 2 +- .../delete/qemu-server/101.conf | 4 +- .../delete/qemu-server/102.conf | 6 +- .../delete/qemu-server/103.conf | 6 +- .../delete/qemu-server/104.conf | 8 +- .../delete/qemu-server/105.conf | 6 +- .../delete/qemu-server/106.conf | 12 +-- .../delete/qemu-server/201.conf | 6 +- .../delete/qemu-server/202.conf | 12 +-- .../delete/qemu-server/203.conf | 4 +- .../delete/qemu-server/204.conf | 4 +- .../prepare/qemu-server/101.conf | 2 +- .../prepare/qemu-server/102.conf | 2 +- .../prepare/qemu-server/103.conf | 4 +- .../prepare/qemu-server/104.conf | 4 +- .../prepare/qemu-server/200.conf | 2 +- .../prepare/qemu-server/201.conf | 4 +- .../prepare/qemu-server/202.conf | 2 +- .../prepare/qemu-server/300.conf | 2 +- .../rollback/qemu-server/101.conf | 4 +- .../rollback/qemu-server/102.conf | 6 +- .../rollback/qemu-server/103.conf | 6 +- .../rollback/qemu-server/104.conf | 8 +- .../rollback/qemu-server/105.conf | 12 +-- .../rollback/qemu-server/106.conf | 4 +- .../rollback/qemu-server/201.conf | 4 +- .../rollback/qemu-server/202.conf | 4 +- .../rollback/qemu-server/203.conf | 4 +- .../rollback/qemu-server/204.conf | 4 +- .../rollback/qemu-server/205.conf | 4 +- .../rollback/qemu-server/206.conf | 12 +-- .../rollback/qemu-server/207.conf | 12 +-- .../rollback/qemu-server/301.conf | 4 +- .../rollback/qemu-server/302.conf | 4 +- .../rollback/qemu-server/303.conf | 4 +- src/test/test_get_replicatable_volumes.pl | 22 ++--- 165 files changed, 508 insertions(+), 468 deletions(-) create mode 100644 src/test/restore-config-expected/140.conf create mode 100644 src/test/restore-config-input/140.conf Summary over all repositories: 174 files changed, 529 insertions(+), 489 deletions(-) -- Generated by git-murpp 0.5.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel