The 'disk-size' format in the JSON schema in pve-common was changed to
print more verbose, non-ambiguous disk size suffixes. While the
previous commit changed the necessary test cases to not fail, adapt
all tests to match how configurations are actually written now.
Add a dedicated restore test where the backup configuration uses the
short suffixes to still test for that.
Signed-off-by: Fiona Ebner <f.eb...@proxmox.com>
---
test/cfg2cmd/bootorder-empty.conf | 6 +-
test/cfg2cmd/bootorder-legacy.conf | 6 +-
test/cfg2cmd/bootorder.conf | 6 +-
.../cputype-icelake-client-deprecation.conf | 2 +-
test/cfg2cmd/efi-secboot-and-tpm-q35.conf | 4 +-
test/cfg2cmd/efi-secboot-and-tpm.conf | 4 +-
test/cfg2cmd/efidisk-on-rbd.conf | 2 +-
test/cfg2cmd/i440fx-win10-hostpci.conf | 2 +-
test/cfg2cmd/ide-no-media-error.conf | 10 +--
test/cfg2cmd/ide.conf | 10 +--
test/cfg2cmd/pinned-version-pxe-pve.conf | 2 +-
test/cfg2cmd/pinned-version-pxe.conf | 2 +-
test/cfg2cmd/pinned-version.conf | 2 +-
test/cfg2cmd/q35-ide.conf | 10 +--
test/cfg2cmd/q35-linux-hostpci-mapping.conf | 2 +-
.../q35-linux-hostpci-multifunction.conf | 2 +-
test/cfg2cmd/q35-linux-hostpci-template.conf | 6 +-
.../q35-linux-hostpci-x-pci-overrides.conf | 2 +-
test/cfg2cmd/q35-linux-hostpci.conf | 2 +-
test/cfg2cmd/q35-simple-6.0.conf | 2 +-
test/cfg2cmd/q35-simple-7.0.conf | 2 +-
test/cfg2cmd/q35-simple-pinned-6.1.conf | 2 +-
test/cfg2cmd/q35-simple.conf | 2 +-
test/cfg2cmd/q35-win10-hostpci.conf | 2 +-
test/cfg2cmd/seabios_serial.conf | 2 +-
test/cfg2cmd/sev-es.conf | 2 +-
test/cfg2cmd/sev-std.conf | 2 +-
.../simple-balloon-free-page-reporting.conf | 2 +-
test/cfg2cmd/simple-btrfs.conf | 2 +-
test/cfg2cmd/simple-rbd.conf | 4 +-
test/cfg2cmd/simple-virtio-blk.conf | 2 +-
test/cfg2cmd/simple-zfs-over-iscsi.conf | 2 +-
test/cfg2cmd/simple1-template.conf | 4 +-
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 +-
test/parse-config-input/fleecing-section.conf | 2 +-
test/parse-config-input/locked.conf | 2 +-
test/parse-config-input/plain.conf | 2 +-
test/parse-config-input/regular-vm-efi.conf | 4 +-
test/parse-config-input/sections.conf | 4 +-
test/parse-config-input/snapshots.conf | 84 +++++++++----------
test/parse-config-input/unknown-sections.conf | 4 +-
test/parse-config-input/verify-snapshot.conf | 4 +-
test/restore-config-expected/140.conf | 18 ++++
test/restore-config-expected/179.conf | 2 +-
test/restore-config-input/139.conf | 4 +-
test/restore-config-input/140.conf | 22 +++++
test/restore-config-input/142.conf | 2 +-
test/restore-config-input/1422.conf | 2 +-
test/restore-config-input/179.conf | 10 +--
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 +-
test/test_get_replicatable_volumes.pl | 22 ++---
160 files changed, 442 insertions(+), 402 deletions(-)
create mode 100644 test/restore-config-expected/140.conf
create mode 100644 test/restore-config-input/140.conf
diff --git a/test/cfg2cmd/bootorder-empty.conf
b/test/cfg2cmd/bootorder-empty.conf
index ccfadb9f..13a92578 100644
--- a/test/cfg2cmd/bootorder-empty.conf
+++ b/test/cfg2cmd/bootorder-empty.conf
@@ -7,9 +7,9 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858KiB
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
-virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
-virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858KiB
+virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858KiB
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/test/cfg2cmd/bootorder-legacy.conf
b/test/cfg2cmd/bootorder-legacy.conf
index 4e59268b..3a946a92 100644
--- a/test/cfg2cmd/bootorder-legacy.conf
+++ b/test/cfg2cmd/bootorder-legacy.conf
@@ -8,9 +8,9 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858KiB
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
-virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
-virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858KiB
+virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858KiB
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/test/cfg2cmd/bootorder.conf b/test/cfg2cmd/bootorder.conf
index 7991065d..1bcb2c3f 100644
--- a/test/cfg2cmd/bootorder.conf
+++ b/test/cfg2cmd/bootorder.conf
@@ -7,9 +7,9 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858KiB
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
-virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
-virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858KiB
+virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858KiB
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/test/cfg2cmd/cputype-icelake-client-deprecation.conf
b/test/cfg2cmd/cputype-icelake-client-deprecation.conf
index c0c4b929..38ba73c8 100644
--- a/test/cfg2cmd/cputype-icelake-client-deprecation.conf
+++ b/test/cfg2cmd/cputype-icelake-client-deprecation.conf
@@ -6,7 +6,7 @@ ide2: none,media=cdrom
memory: 768
name: simple
ostype: l26
-scsi0: local:8006/base-8006-disk-0.qcow2,discard=on,size=104858K
+scsi0: local:8006/base-8006-disk-0.qcow2,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/test/cfg2cmd/efi-secboot-and-tpm-q35.conf
b/test/cfg2cmd/efi-secboot-and-tpm-q35.conf
index 5d4b5f5e..e13b80e7 100644
--- a/test/cfg2cmd/efi-secboot-and-tpm-q35.conf
+++ b/test/cfg2cmd/efi-secboot-and-tpm-q35.conf
@@ -2,5 +2,5 @@
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
machine: q35
-efidisk0: local:100/vm-disk-100-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
-tpmstate0: local:108/vm-100-disk-1.raw,size=4M,version=v2.0
+efidisk0:
local:100/vm-disk-100-0.raw,efitype=4m,pre-enrolled-keys=1,size=528KiB
+tpmstate0: local:108/vm-100-disk-1.raw,size=4MiB,version=v2.0
diff --git a/test/cfg2cmd/efi-secboot-and-tpm.conf
b/test/cfg2cmd/efi-secboot-and-tpm.conf
index 915424ec..9e62ec27 100644
--- a/test/cfg2cmd/efi-secboot-and-tpm.conf
+++ b/test/cfg2cmd/efi-secboot-and-tpm.conf
@@ -1,5 +1,5 @@
# TEST: Test newer 4MB efidisk with secureboot and a TPM device
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
-efidisk0: local:100/vm-disk-100-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
-tpmstate0: local:108/vm-100-disk-1.raw,size=4M,version=v2.0
+efidisk0:
local:100/vm-disk-100-0.raw,efitype=4m,pre-enrolled-keys=1,size=528KiB
+tpmstate0: local:108/vm-100-disk-1.raw,size=4MiB,version=v2.0
diff --git a/test/cfg2cmd/efidisk-on-rbd.conf b/test/cfg2cmd/efidisk-on-rbd.conf
index 1958fe61..04f94e1b 100644
--- a/test/cfg2cmd/efidisk-on-rbd.conf
+++ b/test/cfg2cmd/efidisk-on-rbd.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: rbd-store:vm-100-disk-1,size=128K
+efidisk0: rbd-store:vm-100-disk-1,size=128KiB
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
numa: 1
diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf
b/test/cfg2cmd/i440fx-win10-hostpci.conf
index 2ab2dda1..2129f8d7 100644
--- a/test/cfg2cmd/i440fx-win10-hostpci.conf
+++ b/test/cfg2cmd/i440fx-win10-hostpci.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
hostpci0: 0f:f2.0
machine: pc
memory: 512
diff --git a/test/cfg2cmd/ide-no-media-error.conf
b/test/cfg2cmd/ide-no-media-error.conf
index 48971463..9effcf75 100644
--- a/test/cfg2cmd/ide-no-media-error.conf
+++ b/test/cfg2cmd/ide-no-media-error.conf
@@ -2,14 +2,14 @@
# EXPECT_ERROR: ide3: explicit media parameter is required for iso images
bootdisk: scsi0
cores: 2
-ide0: cifs-store:iso/zero.iso,media=cdrom,size=112M
-ide1: cifs-store:iso/one.iso,media=cdrom,size=112M
-ide2: cifs-store:iso/two.iso,media=disk,size=112M
-ide3: cifs-store:iso/three.iso,size=112M
+ide0: cifs-store:iso/zero.iso,media=cdrom,size=112MiB
+ide1: cifs-store:iso/one.iso,media=cdrom,size=112MiB
+ide2: cifs-store:iso/two.iso,media=disk,size=112MiB
+ide3: cifs-store:iso/three.iso,size=112MiB
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
ostype: l26
-scsi0: local:100/vm-100-disk-2.qcow2,size=10G
+scsi0: local:100/vm-100-disk-2.qcow2,size=10GiB
scsihw: virtio-scsi-pci
smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687
vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d
diff --git a/test/cfg2cmd/ide.conf b/test/cfg2cmd/ide.conf
index 0c48aac8..7114413e 100644
--- a/test/cfg2cmd/ide.conf
+++ b/test/cfg2cmd/ide.conf
@@ -1,14 +1,14 @@
# TEST: Config with default machine type, Linux & four IDE CD-ROMs
bootdisk: scsi0
cores: 2
-ide0: cifs-store:iso/zero.iso,media=cdrom,size=112M
-ide1: cifs-store:iso/one.iso,media=cdrom,size=112M
-ide2: cifs-store:iso/two.iso,media=cdrom,size=112M
-ide3: cifs-store:iso/three.iso,media=cdrom,size=112M
+ide0: cifs-store:iso/zero.iso,media=cdrom,size=112MiB
+ide1: cifs-store:iso/one.iso,media=cdrom,size=112MiB
+ide2: cifs-store:iso/two.iso,media=cdrom,size=112MiB
+ide3: cifs-store:iso/three.iso,media=cdrom,size=112MiB
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
ostype: l26
-scsi0: local:100/vm-100-disk-2.qcow2,size=10G
+scsi0: local:100/vm-100-disk-2.qcow2,size=10GiB
scsihw: virtio-scsi-pci
smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687
vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d
diff --git a/test/cfg2cmd/pinned-version-pxe-pve.conf
b/test/cfg2cmd/pinned-version-pxe-pve.conf
index 36169d7b..7dc9faf9 100644
--- a/test/cfg2cmd/pinned-version-pxe-pve.conf
+++ b/test/cfg2cmd/pinned-version-pxe-pve.conf
@@ -8,7 +8,7 @@ name: pinned
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858K
+scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0
sockets: 1
diff --git a/test/cfg2cmd/pinned-version-pxe.conf
b/test/cfg2cmd/pinned-version-pxe.conf
index 738868f2..cd723c2d 100644
--- a/test/cfg2cmd/pinned-version-pxe.conf
+++ b/test/cfg2cmd/pinned-version-pxe.conf
@@ -8,7 +8,7 @@ name: pinned
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858K
+scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0
sockets: 1
diff --git a/test/cfg2cmd/pinned-version.conf b/test/cfg2cmd/pinned-version.conf
index 61191836..aa86b682 100644
--- a/test/cfg2cmd/pinned-version.conf
+++ b/test/cfg2cmd/pinned-version.conf
@@ -8,7 +8,7 @@ name: pinned
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858K
+scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0
sockets: 1
diff --git a/test/cfg2cmd/q35-ide.conf b/test/cfg2cmd/q35-ide.conf
index bfef0a14..2f8f4b16 100644
--- a/test/cfg2cmd/q35-ide.conf
+++ b/test/cfg2cmd/q35-ide.conf
@@ -1,15 +1,15 @@
# TEST: Config with q35, Linux & four IDE CD-ROMs
bootdisk: scsi0
cores: 2
-ide0: cifs-store:iso/zero.iso,media=cdrom,size=112M
-ide1: cifs-store:iso/one.iso,media=cdrom,size=112M
-ide2: cifs-store:iso/two.iso,media=cdrom,size=112M
-ide3: cifs-store:iso/three.iso,media=cdrom,size=112M
+ide0: cifs-store:iso/zero.iso,media=cdrom,size=112MiB
+ide1: cifs-store:iso/one.iso,media=cdrom,size=112MiB
+ide2: cifs-store:iso/two.iso,media=cdrom,size=112MiB
+ide3: cifs-store:iso/three.iso,media=cdrom,size=112MiB
machine: q35
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
ostype: l26
-scsi0: local:100/vm-100-disk-2.qcow2,size=10G
+scsi0: local:100/vm-100-disk-2.qcow2,size=10GiB
scsihw: virtio-scsi-pci
smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687
vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d
diff --git a/test/cfg2cmd/q35-linux-hostpci-mapping.conf
b/test/cfg2cmd/q35-linux-hostpci-mapping.conf
index 2366fc4a..609f4596 100644
--- a/test/cfg2cmd/q35-linux-hostpci-mapping.conf
+++ b/test/cfg2cmd/q35-linux-hostpci-mapping.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
hostpci0: mapping=someNic
hostpci1: mapping=someGpu,mdev=some-model
hostpci2: mapping=someNic
diff --git a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf
b/test/cfg2cmd/q35-linux-hostpci-multifunction.conf
index 5f1a3ff7..a84bcd55 100644
--- a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf
+++ b/test/cfg2cmd/q35-linux-hostpci-multifunction.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
hostpci0: f0:43
hostpci1: 1234:f0:43
machine: q35
diff --git a/test/cfg2cmd/q35-linux-hostpci-template.conf
b/test/cfg2cmd/q35-linux-hostpci-template.conf
index dfbf1322..0ba8681d 100644
--- a/test/cfg2cmd/q35-linux-hostpci-template.conf
+++ b/test/cfg2cmd/q35-linux-hostpci-template.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/base-100-disk-1.qcow2,size=128K
+efidisk0: local:100/base-100-disk-1.qcow2,size=128KiB
hostpci0: 00:ff.1
hostpci1: d0:13.0,pcie=1
hostpci2: 00:f4.0
@@ -15,9 +15,9 @@ net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
numa: 1
ostype: l26
scsihw: virtio-scsi-pci
-scsi0: local:100/base-100-disk-2.raw,size=10G
+scsi0: local:100/base-100-disk-2.raw,size=10GiB
smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687
sockets: 2
template: 1
-tpmstate0: local:100/base-100-disk-1.raw,size=4M,version=v2.0
+tpmstate0: local:100/base-100-disk-1.raw,size=4MiB,version=v2.0
vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d
diff --git a/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf
b/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf
index b726a3a4..8ccbb27f 100644
--- a/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf
+++ b/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
hostpci0:
00:ff.1,vendor-id=0x1234,device-id=0x5678,sub-vendor-id=0x2233,sub-device-id=0x0000
hostpci1: d0:13.0,pcie=1,vendor-id=0x1234,device-id=0x5678
machine: q35
diff --git a/test/cfg2cmd/q35-linux-hostpci.conf
b/test/cfg2cmd/q35-linux-hostpci.conf
index 7290120a..04fe6876 100644
--- a/test/cfg2cmd/q35-linux-hostpci.conf
+++ b/test/cfg2cmd/q35-linux-hostpci.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
hostpci0: 00:ff.1
hostpci1: d0:13.0,pcie=1
hostpci2: 00:f4.0
diff --git a/test/cfg2cmd/q35-simple-6.0.conf b/test/cfg2cmd/q35-simple-6.0.conf
index d482dfea..9a49ec86 100644
--- a/test/cfg2cmd/q35-simple-6.0.conf
+++ b/test/cfg2cmd/q35-simple-6.0.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 2
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
machine: pc-q35-6.0
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
diff --git a/test/cfg2cmd/q35-simple-7.0.conf b/test/cfg2cmd/q35-simple-7.0.conf
index 9e3097ee..7d67a92d 100644
--- a/test/cfg2cmd/q35-simple-7.0.conf
+++ b/test/cfg2cmd/q35-simple-7.0.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 2
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
machine: pc-q35-7.0
meta: creation-qemu=6.1
memory: 512
diff --git a/test/cfg2cmd/q35-simple-pinned-6.1.conf
b/test/cfg2cmd/q35-simple-pinned-6.1.conf
index 9ecfe006..51f71f20 100644
--- a/test/cfg2cmd/q35-simple-pinned-6.1.conf
+++ b/test/cfg2cmd/q35-simple-pinned-6.1.conf
@@ -3,7 +3,7 @@
bios: ovmf
bootdisk: scsi0
cores: 2
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
machine: pc-q35-6.1
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
diff --git a/test/cfg2cmd/q35-simple.conf b/test/cfg2cmd/q35-simple.conf
index 21f78122..803c48a2 100644
--- a/test/cfg2cmd/q35-simple.conf
+++ b/test/cfg2cmd/q35-simple.conf
@@ -3,7 +3,7 @@
bios: ovmf
bootdisk: scsi0
cores: 2
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
machine: q35
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
diff --git a/test/cfg2cmd/q35-win10-hostpci.conf
b/test/cfg2cmd/q35-win10-hostpci.conf
index a8f6e342..ef596718 100644
--- a/test/cfg2cmd/q35-win10-hostpci.conf
+++ b/test/cfg2cmd/q35-win10-hostpci.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vm-100-disk-1.qcow2,size=128KiB
hostpci0: f0:42.0
hostpci1: f0:43.0,pcie=1
hostpci4: 00:43.1,pcie=1
diff --git a/test/cfg2cmd/seabios_serial.conf b/test/cfg2cmd/seabios_serial.conf
index 7ebfa504..56aa160f 100644
--- a/test/cfg2cmd/seabios_serial.conf
+++ b/test/cfg2cmd/seabios_serial.conf
@@ -7,7 +7,7 @@ name: seabiosserial
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
serial0: socket
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
diff --git a/test/cfg2cmd/sev-es.conf b/test/cfg2cmd/sev-es.conf
index bdae430e..29085e44 100644
--- a/test/cfg2cmd/sev-es.conf
+++ b/test/cfg2cmd/sev-es.conf
@@ -2,5 +2,5 @@
# HW_CAPABILITIES: amd-turin-9005
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
-efidisk0: local:100/vm-disk-100-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
+efidisk0:
local:100/vm-disk-100-0.raw,efitype=4m,pre-enrolled-keys=1,size=528KiB
amd-sev: type=es
diff --git a/test/cfg2cmd/sev-std.conf b/test/cfg2cmd/sev-std.conf
index d636f559..42293b0a 100644
--- a/test/cfg2cmd/sev-std.conf
+++ b/test/cfg2cmd/sev-std.conf
@@ -2,5 +2,5 @@
# HW_CAPABILITIES: amd-turin-9005
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
-efidisk0: local:100/vm-disk-100-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
+efidisk0:
local:100/vm-disk-100-0.raw,efitype=4m,pre-enrolled-keys=1,size=528KiB
amd-sev: type=std
diff --git a/test/cfg2cmd/simple-balloon-free-page-reporting.conf
b/test/cfg2cmd/simple-balloon-free-page-reporting.conf
index ae71eaf6..65458443 100644
--- a/test/cfg2cmd/simple-balloon-free-page-reporting.conf
+++ b/test/cfg2cmd/simple-balloon-free-page-reporting.conf
@@ -8,7 +8,7 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/test/cfg2cmd/simple-btrfs.conf b/test/cfg2cmd/simple-btrfs.conf
index e18d1349..8e683175 100644
--- a/test/cfg2cmd/simple-btrfs.conf
+++ b/test/cfg2cmd/simple-btrfs.conf
@@ -7,7 +7,7 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: btrfs-store:8006/vm-8006-disk-0.raw,discard=on,size=104858K
+scsi0: btrfs-store:8006/vm-8006-disk-0.raw,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/test/cfg2cmd/simple-rbd.conf b/test/cfg2cmd/simple-rbd.conf
index 535491de..e1ff5bb2 100644
--- a/test/cfg2cmd/simple-rbd.conf
+++ b/test/cfg2cmd/simple-rbd.conf
@@ -7,8 +7,8 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: rbd-store:vm-8006-disk-0,discard=on,size=104858K
-scsi1: krbd-store:vm-8006-disk-0,discard=on,size=104858K
+scsi0: rbd-store:vm-8006-disk-0,discard=on,size=104858KiB
+scsi1: krbd-store:vm-8006-disk-0,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/test/cfg2cmd/simple-virtio-blk.conf
b/test/cfg2cmd/simple-virtio-blk.conf
index d9db7580..b8c1f418 100644
--- a/test/cfg2cmd/simple-virtio-blk.conf
+++ b/test/cfg2cmd/simple-virtio-blk.conf
@@ -9,5 +9,5 @@ numa: 0
ostype: l26
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
-virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858KiB
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/test/cfg2cmd/simple-zfs-over-iscsi.conf
b/test/cfg2cmd/simple-zfs-over-iscsi.conf
index 055c6fc4..125bc748 100644
--- a/test/cfg2cmd/simple-zfs-over-iscsi.conf
+++ b/test/cfg2cmd/simple-zfs-over-iscsi.conf
@@ -7,7 +7,7 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: zfs-over-iscsi-store:vm-8006-disk-0,discard=on,size=104858K
+scsi0: zfs-over-iscsi-store:vm-8006-disk-0,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/test/cfg2cmd/simple1-template.conf
b/test/cfg2cmd/simple1-template.conf
index 491aa7d0..0f6ca639 100644
--- a/test/cfg2cmd/simple1-template.conf
+++ b/test/cfg2cmd/simple1-template.conf
@@ -7,8 +7,8 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-sata0: local:8006/base-8006-disk-0.qcow2,discard=on,size=104858K
-scsi0: local:8006/base-8006-disk-1.qcow2,discard=on,size=104858K
+sata0: local:8006/base-8006-disk-0.qcow2,discard=on,size=104858KiB
+scsi0: local:8006/base-8006-disk-1.qcow2,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/test/cfg2cmd/simple1.conf b/test/cfg2cmd/simple1.conf
index 9feb9d26..f0afaffc 100644
--- a/test/cfg2cmd/simple1.conf
+++ b/test/cfg2cmd/simple1.conf
@@ -7,7 +7,7 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858KiB
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/test/cfg2cmd/unsupported-storage-content-type.conf
b/test/cfg2cmd/unsupported-storage-content-type.conf
index e33165a8..943bf68d 100644
--- a/test/cfg2cmd/unsupported-storage-content-type.conf
+++ b/test/cfg2cmd/unsupported-storage-content-type.conf
@@ -1,3 +1,3 @@
# TEST: Unsupported storage content type in a volume disk
# EXPECT_ERROR: storage 'noimages' does not support content-type 'images'
-scsi0: noimages:8006/vm-8006-disk-0.raw,iothread=1,size=32G
+scsi0: noimages:8006/vm-8006-disk-0.raw,iothread=1,size=32GiB
diff --git a/test/parse-config-expected/cloudinit-snapshot.conf
b/test/parse-config-expected/cloudinit-snapshot.conf
index bc01f975..d400a4c1 100644
--- a/test/parse-config-expected/cloudinit-snapshot.conf
+++ b/test/parse-config-expected/cloudinit-snapshot.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: cloudinit
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -32,7 +32,7 @@ meta: creation-qemu=9.0.2,ctime=1725975013
name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737549549
diff --git a/test/parse-config-expected/duplicate-sections.conf
b/test/parse-config-expected/duplicate-sections.conf
index 1cb7a88a..5337785a 100644
--- a/test/parse-config-expected/duplicate-sections.conf
+++ b/test/parse-config-expected/duplicate-sections.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -35,7 +35,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/test/parse-config-expected/unknown-sections.conf
b/test/parse-config-expected/unknown-sections.conf
index 6329c33a..dd95de0b 100644
--- a/test/parse-config-expected/unknown-sections.conf
+++ b/test/parse-config-expected/unknown-sections.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -36,7 +36,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/test/parse-config-expected/verify-snapshot.conf
b/test/parse-config-expected/verify-snapshot.conf
index cd503f86..13fa6e6e 100644
--- a/test/parse-config-expected/verify-snapshot.conf
+++ b/test/parse-config-expected/verify-snapshot.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: snap
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -28,7 +28,7 @@ meta: creation-qemu=9.0.2,ctime=1725975013
name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737549549
diff --git a/test/parse-config-input/cloudinit-snapshot.conf
b/test/parse-config-input/cloudinit-snapshot.conf
index 9be05b1c..8649fc76 100644
--- a/test/parse-config-input/cloudinit-snapshot.conf
+++ b/test/parse-config-input/cloudinit-snapshot.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: cloudinit
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -33,7 +33,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: verify meee~ :)
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737549549
diff --git a/test/parse-config-input/duplicate-sections.conf
b/test/parse-config-input/duplicate-sections.conf
index 41e90e37..95378032 100644
--- a/test/parse-config-input/duplicate-sections.conf
+++ b/test/parse-config-input/duplicate-sections.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -41,7 +41,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
@@ -60,7 +60,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/test/parse-config-input/fleecing-section.conf
b/test/parse-config-input/fleecing-section.conf
index ee89dc56..f6a197fd 100644
--- a/test/parse-config-input/fleecing-section.conf
+++ b/test/parse-config-input/fleecing-section.conf
@@ -9,7 +9,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
diff --git a/test/parse-config-input/locked.conf
b/test/parse-config-input/locked.conf
index 38b6e36c..f710e6fc 100644
--- a/test/parse-config-input/locked.conf
+++ b/test/parse-config-input/locked.conf
@@ -8,7 +8,7 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: mydir:1422/vm-1422-disk-0.qcow2,size=4G
+scsi0: mydir:1422/vm-1422-disk-0.qcow2,size=4GiB
scsihw: virtio-scsi-pci
smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
sockets: 1
diff --git a/test/parse-config-input/plain.conf
b/test/parse-config-input/plain.conf
index 63449b9e..ed87cf0f 100644
--- a/test/parse-config-input/plain.conf
+++ b/test/parse-config-input/plain.conf
@@ -7,7 +7,7 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: mydir:142/vm-142-disk-0.qcow2,size=4G
+scsi0: mydir:142/vm-142-disk-0.qcow2,size=4GiB
scsihw: virtio-scsi-pci
smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
sockets: 1
diff --git a/test/parse-config-input/regular-vm-efi.conf
b/test/parse-config-input/regular-vm-efi.conf
index 9d75fff2..206c840f 100644
--- a/test/parse-config-input/regular-vm-efi.conf
+++ b/test/parse-config-input/regular-vm-efi.conf
@@ -2,14 +2,14 @@
bios: ovmf
boot: order=scsi0;ide2;net0
cores: 1
-efidisk0: mydir:139/vm-139-disk-0.qcow2,size=128K
+efidisk0: mydir:139/vm-139-disk-0.qcow2,size=128KiB
ide2: local:iso/debian-10.6.0-amd64-netinst.iso,media=cdrom
memory: 2048
name: eficloneclone
net0: virtio=7A:6C:A5:8B:11:93,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: rbdkvm:vm-139-disk-1,size=4G
+scsi0: rbdkvm:vm-139-disk-1,size=4GiB
scsihw: virtio-scsi-pci
smbios1: uuid=21a7e7bc-3cd2-4232-a009-a41f4ee992ae
sockets: 1
diff --git a/test/parse-config-input/sections.conf
b/test/parse-config-input/sections.conf
index 6329c33a..dd95de0b 100644
--- a/test/parse-config-input/sections.conf
+++ b/test/parse-config-input/sections.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -36,7 +36,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/test/parse-config-input/snapshots.conf
b/test/parse-config-input/snapshots.conf
index 4f4f8675..2c9f7e1f 100644
--- a/test/parse-config-input/snapshots.conf
+++ b/test/parse-config-input/snapshots.conf
@@ -1,9 +1,9 @@
boot: order=scsi1;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-ide0: dir:111/vm-111-disk-2.qcow2,size=1G
-ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
-ide2: sani:iso/Win2019-evaluation.iso,media=cdrom,size=4985424K
+ide0: dir:111/vm-111-disk-2.qcow2,size=1GiB
+ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456KiB
+ide2: sani:iso/Win2019-evaluation.iso,media=cdrom,size=4985424KiB
machine: pc-i440fx-9.1
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
@@ -13,22 +13,22 @@ net1: e1000=BC:24:11:79:D5:65,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: win19_5_2_plus_stuff
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
-scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32G
+scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1GiB
+scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32GiB
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
sockets: 1
unused0: rbd:vm-111-disk-0
vga: qxl
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1GiB
vmgenid: 713da648-38a6-489e-b0b2-dd9cef419f33
[machine_version_5_1]
boot: order=ide0;ide2;net0
cores: 4
cpu: x86-64-v2-AES
-ide0: lvmthinbig:vm-111-disk-0,size=32G
-ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
+ide0: lvmthinbig:vm-111-disk-0,size=32GiB
+ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078KiB
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
name: win-machine-ver
@@ -45,9 +45,9 @@ vmgenid: 1f314a76-50a3-4b92-9307-c8c6e313d3ca
boot: order=ide0;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-ide0: lvmthinbig:vm-111-disk-0,size=32G
-ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
-ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
+ide0: lvmthinbig:vm-111-disk-0,size=32GiB
+ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456KiB
+ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078KiB
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
name: win-machine-ver
@@ -55,12 +55,12 @@ net0: virtio=BC:24:11:A3:DA:B1,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: machine_version_5_1
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1GiB
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736940462
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1GiB
vmgenid: 4f602356-cb9c-45ad-a554-d76d95c7c0f8
[ovmf_machine_version_5_1]
@@ -68,10 +68,10 @@ bios: ovmf
boot: order=ide0;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
-ide0: lvmthinbig:vm-111-disk-0,size=32G
-ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
-ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
+efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1MiB
+ide0: lvmthinbig:vm-111-disk-0,size=32GiB
+ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456KiB
+ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078KiB
machine: pc-q35-5.1
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
@@ -80,12 +80,12 @@ net0: e1000=BC:24:11:A3:DA:B1,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: machine_version_5_1_with_virtio
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1GiB
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736943308
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1GiB
vmgenid: 4f602356-cb9c-45ad-a554-d76d95c7c0f8
[ovmf_machine_version_5_1_virtio]
@@ -93,10 +93,10 @@ bios: ovmf
boot: order=ide0;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
-ide0: lvmthinbig:vm-111-disk-0,size=32G
-ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
-ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
+efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1MiB
+ide0: lvmthinbig:vm-111-disk-0,size=32GiB
+ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456KiB
+ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078KiB
machine: pc-q35-5.1
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
@@ -105,12 +105,12 @@ net0: virtio=BC:24:11:A3:DA:B1,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: ovmf_machine_version_5_1
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1GiB
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736944525
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1GiB
vmgenid: 00b95468-4f34-4faa-b0af-b214ff5bbcdf
[static-network]
@@ -118,10 +118,10 @@ bios: ovmf
boot: order=ide0;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
-ide0: lvmthinbig:vm-111-disk-0,size=32G
-ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
-ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
+efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1MiB
+ide0: lvmthinbig:vm-111-disk-0,size=32GiB
+ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456KiB
+ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078KiB
machine: pc-q35-5.1
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
@@ -130,20 +130,20 @@ net0: virtio=BC:24:11:A3:DA:B1,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: ovmf_machine_version_5_1_virtio
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1GiB
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736945713
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1GiB
vmgenid: 5d65fc62-2cb1-4945-9641-631b37c265a5
[win19_5_2]
boot: order=scsi1;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
-ide2: sani:iso/Win2019-evaluation.iso,media=cdrom,size=4985424K
+ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456KiB
+ide2: sani:iso/Win2019-evaluation.iso,media=cdrom,size=4985424KiB
machine: pc-i440fx-5.2
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
@@ -153,22 +153,22 @@ net1: e1000=BC:24:11:79:D5:65,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: machine_version_5_1_with_virtio
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
-scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32G
+scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1GiB
+scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32GiB
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736950690
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1GiB
vmgenid: f259de06-fa08-4ff7-8ba9-b1233a726ac4
[win19_5_2_plus_stuff]
boot: order=scsi1;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-ide0: dir:111/vm-111-disk-2.qcow2,size=1G
-ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
-ide2: sani:iso/Win2019-evaluation.iso,media=cdrom,size=4985424K
+ide0: dir:111/vm-111-disk-2.qcow2,size=1GiB
+ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456KiB
+ide2: sani:iso/Win2019-evaluation.iso,media=cdrom,size=4985424KiB
machine: pc-i440fx-5.2
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
@@ -178,12 +178,12 @@ net1: e1000=BC:24:11:79:D5:65,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: win19_5_2
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
-scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32G
+scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1GiB
+scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32GiB
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736951300
sockets: 1
vga: qxl
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1GiB
vmgenid: 713da648-38a6-489e-b0b2-dd9cef419f33
diff --git a/test/parse-config-input/unknown-sections.conf
b/test/parse-config-input/unknown-sections.conf
index 0dcd5951..336d33a4 100644
--- a/test/parse-config-input/unknown-sections.conf
+++ b/test/parse-config-input/unknown-sections.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -45,7 +45,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/test/parse-config-input/verify-snapshot.conf
b/test/parse-config-input/verify-snapshot.conf
index 5f52272d..b290dcb8 100644
--- a/test/parse-config-input/verify-snapshot.conf
+++ b/test/parse-config-input/verify-snapshot.conf
@@ -10,7 +10,7 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: snap
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
@@ -29,7 +29,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: verify meee~ :)
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4GiB
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737549549
diff --git a/test/restore-config-expected/140.conf
b/test/restore-config-expected/140.conf
new file mode 100644
index 00000000..6c4c4660
--- /dev/null
+++ b/test/restore-config-expected/140.conf
@@ -0,0 +1,18 @@
+# regular VM with an EFI disk using short disk size suffixes
+bios: ovmf
+boot: order=scsi0;ide2;net0
+cores: 1
+efidisk0: target:140/vm-140-disk-0.qcow2,size=128KiB
+ide2: local:iso/debian-10.6.0-amd64-netinst.iso,media=cdrom
+memory: 2048
+name: eficloneclone
+net0: virtio=7A:6C:A5:8B:11:93,bridge=vmbr0,firewall=1
+numa: 0
+ostype: l26
+scsi0: target:140/vm-140-disk-1.raw,size=4GiB
+scsi1: target:140/vm-140-disk-2.raw,size=4MiB
+scsi2: target:140/vm-140-disk-3.raw,size=4TiB
+scsihw: virtio-scsi-pci
+smbios1: uuid=21a7e7bc-3cd2-4232-a009-a41f4ee992ae
+sockets: 1
+vmgenid: 0
diff --git a/test/restore-config-expected/179.conf
b/test/restore-config-expected/179.conf
index 255318fb..50bf8163 100644
--- a/test/restore-config-expected/179.conf
+++ b/test/restore-config-expected/179.conf
@@ -10,7 +10,7 @@ scsi0:
target:179/vm-179-disk-0.qcow2,cache=none,discard=on,size=32GiB,ssd=1
scsi1: target:179/vm-179-disk-1.qcow2,cache=writethrough,size=32GiB
scsi2:
target:179/vm-179-disk-2.qcow2,mbps_rd=7,mbps_wr=7,replicate=0,size=32GiB
scsi3: target:179/vm-179-disk-3.vmdk,size=32GiB
-#scsi4: myfs:179/vm-179-disk-1.qcow2,backup=0,size=32G
+#scsi4: myfs:179/vm-179-disk-1.qcow2,backup=0,size=32GiB
scsihw: virtio-scsi-pci
smbios1: uuid=1819ead7-a55d-4544-8d38-29ca94869a9c
sockets: 1
diff --git a/test/restore-config-input/139.conf
b/test/restore-config-input/139.conf
index 5acb4d4d..83d42a93 100644
--- a/test/restore-config-input/139.conf
+++ b/test/restore-config-input/139.conf
@@ -2,14 +2,14 @@
bios: ovmf
boot: order=scsi0;ide2;net0
cores: 1
-efidisk0: mydir:139/vm-139-disk-0.qcow2,size=128K
+efidisk0: mydir:139/vm-139-disk-0.qcow2,size=128KiB
ide2: local:iso/debian-10.6.0-amd64-netinst.iso,media=cdrom
memory: 2048
name: eficloneclone
net0: virtio=7A:6C:A5:8B:11:93,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: rbdkvm:vm-139-disk-1,size=4G
+scsi0: rbdkvm:vm-139-disk-1,size=4GiB
scsihw: virtio-scsi-pci
smbios1: uuid=21a7e7bc-3cd2-4232-a009-a41f4ee992ae
sockets: 1
diff --git a/test/restore-config-input/140.conf
b/test/restore-config-input/140.conf
new file mode 100644
index 00000000..ce051f07
--- /dev/null
+++ b/test/restore-config-input/140.conf
@@ -0,0 +1,22 @@
+# regular VM with an EFI disk using short disk size suffixes
+bios: ovmf
+boot: order=scsi0;ide2;net0
+cores: 1
+efidisk0: mydir:140/vm-140-disk-0.qcow2,size=128K
+ide2: local:iso/debian-10.6.0-amd64-netinst.iso,media=cdrom
+memory: 2048
+name: eficloneclone
+net0: virtio=7A:6C:A5:8B:11:93,bridge=vmbr0,firewall=1
+numa: 0
+ostype: l26
+scsi0: rbdkvm:vm-140-disk-1,size=4G
+scsi1: rbdkvm:vm-140-disk-2,size=4M
+scsi2: rbdkvm:vm-140-disk-3,size=4T
+scsihw: virtio-scsi-pci
+smbios1: uuid=21a7e7bc-3cd2-4232-a009-a41f4ee992ae
+sockets: 1
+vmgenid: 0
+#qmdump#map:efidisk0:drive-efidisk0:mydir:qcow2:
+#qmdump#map:scsi0:drive-scsi0:rbdkvm::
+#qmdump#map:scsi1:drive-scsi1:rbdkvm::
+#qmdump#map:scsi2:drive-scsi2:rbdkvm::
diff --git a/test/restore-config-input/142.conf
b/test/restore-config-input/142.conf
index f3633aaf..160c5a8d 100644
--- a/test/restore-config-input/142.conf
+++ b/test/restore-config-input/142.conf
@@ -7,7 +7,7 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: mydir:142/vm-142-disk-0.qcow2,size=4G
+scsi0: mydir:142/vm-142-disk-0.qcow2,size=4GiB
scsihw: virtio-scsi-pci
smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
sockets: 1
diff --git a/test/restore-config-input/1422.conf
b/test/restore-config-input/1422.conf
index d3155023..7b0a310c 100644
--- a/test/restore-config-input/1422.conf
+++ b/test/restore-config-input/1422.conf
@@ -7,7 +7,7 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: mydir:1422/vm-1422-disk-0.qcow2,size=4G
+scsi0: mydir:1422/vm-1422-disk-0.qcow2,size=4GiB
unused7: mydir:1422/vm-1422-disk-8.qcow2
parent: snap
lock: backup
diff --git a/test/restore-config-input/179.conf
b/test/restore-config-input/179.conf
index e1ee01a5..05e71ca7 100644
--- a/test/restore-config-input/179.conf
+++ b/test/restore-config-input/179.conf
@@ -6,11 +6,11 @@ memory: 2048
net0: virtio=26:15:5B:73:3F:7C,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: myfs:179/vm-179-disk-4.qcow2,cache=none,discard=on,size=32G,ssd=1
-scsi1: myfs:179/vm-179-disk-0.qcow2,cache=writethrough,size=32G
-scsi2: myfs:179/vm-179-disk-2.qcow2,mbps_rd=7,mbps_wr=7,replicate=0,size=32G
-scsi3: myfs:179/vm-179-disk-3.vmdk,size=32G
-scsi4: myfs:179/vm-179-disk-1.qcow2,backup=0,size=32G
+scsi0: myfs:179/vm-179-disk-4.qcow2,cache=none,discard=on,size=32GiB,ssd=1
+scsi1: myfs:179/vm-179-disk-0.qcow2,cache=writethrough,size=32GiB
+scsi2: myfs:179/vm-179-disk-2.qcow2,mbps_rd=7,mbps_wr=7,replicate=0,size=32GiB
+scsi3: myfs:179/vm-179-disk-3.vmdk,size=32GiB
+scsi4: myfs:179/vm-179-disk-1.qcow2,backup=0,size=32GiB
scsihw: virtio-scsi-pci
smbios1: uuid=1819ead7-a55d-4544-8d38-29ca94869a9c
sockets: 1
diff --git a/test/run_qemu_restore_config_tests.pl
b/test/run_qemu_restore_config_tests.pl
index 1566ddf3..63d3877f 100755
--- a/test/run_qemu_restore_config_tests.pl
+++ b/test/run_qemu_restore_config_tests.pl
@@ -17,7 +17,7 @@ my $INPUT_DIR = './restore-config-input';
my $EXPECTED_DIR = './restore-config-expected';
# NOTE update when you add/remove tests
-plan tests => 4;
+plan tests => 5;
my $pve_cluster_module = Test::MockModule->new("PVE::Cluster");
$pve_cluster_module->mock(
diff --git a/test/snapshot-expected/commit/qemu-server/101.conf
b/test/snapshot-expected/commit/qemu-server/101.conf
index 82c95221..9ad295a3 100644
--- a/test/snapshot-expected/commit/qemu-server/101.conf
+++ b/test/snapshot-expected/commit/qemu-server/101.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/commit/qemu-server/102.conf
b/test/snapshot-expected/commit/qemu-server/102.conf
index 01b85317..a28389a7 100644
--- a/test/snapshot-expected/commit/qemu-server/102.conf
+++ b/test/snapshot-expected/commit/qemu-server/102.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/commit/qemu-server/201.conf
b/test/snapshot-expected/commit/qemu-server/201.conf
index f8e99dd6..4a902c48 100644
--- a/test/snapshot-expected/commit/qemu-server/201.conf
+++ b/test/snapshot-expected/commit/qemu-server/201.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/commit/qemu-server/202.conf
b/test/snapshot-expected/commit/qemu-server/202.conf
index a221ba04..8917b392 100644
--- a/test/snapshot-expected/commit/qemu-server/202.conf
+++ b/test/snapshot-expected/commit/qemu-server/202.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/commit/qemu-server/203.conf
b/test/snapshot-expected/commit/qemu-server/203.conf
index e10b68e8..bf8abb0f 100644
--- a/test/snapshot-expected/commit/qemu-server/203.conf
+++ b/test/snapshot-expected/commit/qemu-server/203.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/create/qemu-server/101.conf
b/test/snapshot-expected/create/qemu-server/101.conf
index 9a320026..99023e93 100644
--- a/test/snapshot-expected/create/qemu-server/101.conf
+++ b/test/snapshot-expected/create/qemu-server/101.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/create/qemu-server/102.conf
b/test/snapshot-expected/create/qemu-server/102.conf
index d507956c..766392b8 100644
--- a/test/snapshot-expected/create/qemu-server/102.conf
+++ b/test/snapshot-expected/create/qemu-server/102.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/create/qemu-server/103.conf
b/test/snapshot-expected/create/qemu-server/103.conf
index 198e15ef..08bed4d3 100644
--- a/test/snapshot-expected/create/qemu-server/103.conf
+++ b/test/snapshot-expected/create/qemu-server/103.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/create/qemu-server/104.conf
b/test/snapshot-expected/create/qemu-server/104.conf
index 385625f8..8b4b1643 100644
--- a/test/snapshot-expected/create/qemu-server/104.conf
+++ b/test/snapshot-expected/create/qemu-server/104.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
@@ -37,7 +37,7 @@ vmstate: somestorage:state-volume
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/create/qemu-server/105.conf
b/test/snapshot-expected/create/qemu-server/105.conf
index b692b3e3..75b35cda 100644
--- a/test/snapshot-expected/create/qemu-server/105.conf
+++ b/test/snapshot-expected/create/qemu-server/105.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -8,26 +8,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-expected/create/qemu-server/106.conf
b/test/snapshot-expected/create/qemu-server/106.conf
index d507956c..766392b8 100644
--- a/test/snapshot-expected/create/qemu-server/106.conf
+++ b/test/snapshot-expected/create/qemu-server/106.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/create/qemu-server/201.conf
b/test/snapshot-expected/create/qemu-server/201.conf
index 19a0b859..bc3083b6 100644
--- a/test/snapshot-expected/create/qemu-server/201.conf
+++ b/test/snapshot-expected/create/qemu-server/201.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/create/qemu-server/202.conf
b/test/snapshot-expected/create/qemu-server/202.conf
index 48e3dc99..c73515aa 100644
--- a/test/snapshot-expected/create/qemu-server/202.conf
+++ b/test/snapshot-expected/create/qemu-server/202.conf
@@ -1,14 +1,14 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-2,discard=on,size=32G
+sata0: local:snapshotable-disk-2,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:unsnapshotable-disk-1,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-1,discard=on,size=32GiB
diff --git a/test/snapshot-expected/create/qemu-server/203.conf
b/test/snapshot-expected/create/qemu-server/203.conf
index e89cf9ae..e42467c2 100644
--- a/test/snapshot-expected/create/qemu-server/203.conf
+++ b/test/snapshot-expected/create/qemu-server/203.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/create/qemu-server/301.conf
b/test/snapshot-expected/create/qemu-server/301.conf
index 8cba2dc1..9b0df294 100644
--- a/test/snapshot-expected/create/qemu-server/301.conf
+++ b/test/snapshot-expected/create/qemu-server/301.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/create/qemu-server/302.conf
b/test/snapshot-expected/create/qemu-server/302.conf
index 8cba2dc1..9b0df294 100644
--- a/test/snapshot-expected/create/qemu-server/302.conf
+++ b/test/snapshot-expected/create/qemu-server/302.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/create/qemu-server/303.conf
b/test/snapshot-expected/create/qemu-server/303.conf
index 2731bd1d..243328d2 100644
--- a/test/snapshot-expected/create/qemu-server/303.conf
+++ b/test/snapshot-expected/create/qemu-server/303.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/delete/qemu-server/101.conf
b/test/snapshot-expected/delete/qemu-server/101.conf
index 0fe13593..786da353 100644
--- a/test/snapshot-expected/delete/qemu-server/101.conf
+++ b/test/snapshot-expected/delete/qemu-server/101.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/delete/qemu-server/102.conf
b/test/snapshot-expected/delete/qemu-server/102.conf
index 9a320026..99023e93 100644
--- a/test/snapshot-expected/delete/qemu-server/102.conf
+++ b/test/snapshot-expected/delete/qemu-server/102.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/delete/qemu-server/103.conf
b/test/snapshot-expected/delete/qemu-server/103.conf
index 1ad65c34..6aa46d10 100644
--- a/test/snapshot-expected/delete/qemu-server/103.conf
+++ b/test/snapshot-expected/delete/qemu-server/103.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/delete/qemu-server/104.conf
b/test/snapshot-expected/delete/qemu-server/104.conf
index fc710033..eee4bdca 100644
--- a/test/snapshot-expected/delete/qemu-server/104.conf
+++ b/test/snapshot-expected/delete/qemu-server/104.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#another test comment
bootdisk: ide0
cores: 2
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/delete/qemu-server/105.conf
b/test/snapshot-expected/delete/qemu-server/105.conf
index 11590f16..7d0d4453 100644
--- a/test/snapshot-expected/delete/qemu-server/105.conf
+++ b/test/snapshot-expected/delete/qemu-server/105.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/delete/qemu-server/106.conf
b/test/snapshot-expected/delete/qemu-server/106.conf
index e384152d..c4de8c13 100644
--- a/test/snapshot-expected/delete/qemu-server/106.conf
+++ b/test/snapshot-expected/delete/qemu-server/106.conf
@@ -1,14 +1,14 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:unsnapshotable-disk-2,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-expected/delete/qemu-server/201.conf
b/test/snapshot-expected/delete/qemu-server/201.conf
index 75f00fe9..bdfee6bc 100644
--- a/test/snapshot-expected/delete/qemu-server/201.conf
+++ b/test/snapshot-expected/delete/qemu-server/201.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot-delete
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -34,7 +34,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/delete/qemu-server/202.conf
b/test/snapshot-expected/delete/qemu-server/202.conf
index f28d8a85..6526ab43 100644
--- a/test/snapshot-expected/delete/qemu-server/202.conf
+++ b/test/snapshot-expected/delete/qemu-server/202.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot-delete
memory: 8192
@@ -9,11 +9,11 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:unsnapshotable-disk-2,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
@@ -25,11 +25,11 @@ name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snapstate: delete
snaptime: 1234567890
sockets: 1
unused0: local:snapshotable-disk-1
vga: qxl
-virtio0: local:unsnapshotable-disk-2,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-expected/delete/qemu-server/203.conf
b/test/snapshot-expected/delete/qemu-server/203.conf
index ed93cf72..5150b3aa 100644
--- a/test/snapshot-expected/delete/qemu-server/203.conf
+++ b/test/snapshot-expected/delete/qemu-server/203.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
lock: backup
memory: 8192
@@ -19,7 +19,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/delete/qemu-server/204.conf
b/test/snapshot-expected/delete/qemu-server/204.conf
index fe632046..8042a713 100644
--- a/test/snapshot-expected/delete/qemu-server/204.conf
+++ b/test/snapshot-expected/delete/qemu-server/204.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/prepare/qemu-server/101.conf
b/test/snapshot-expected/prepare/qemu-server/101.conf
index 012880b7..0c6edc2b 100644
--- a/test/snapshot-expected/prepare/qemu-server/101.conf
+++ b/test/snapshot-expected/prepare/qemu-server/101.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/prepare/qemu-server/102.conf
b/test/snapshot-expected/prepare/qemu-server/102.conf
index 8f998ca0..1ae517ad 100644
--- a/test/snapshot-expected/prepare/qemu-server/102.conf
+++ b/test/snapshot-expected/prepare/qemu-server/102.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/prepare/qemu-server/103.conf
b/test/snapshot-expected/prepare/qemu-server/103.conf
index d78f10f9..28fcc196 100644
--- a/test/snapshot-expected/prepare/qemu-server/103.conf
+++ b/test/snapshot-expected/prepare/qemu-server/103.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/prepare/qemu-server/104.conf
b/test/snapshot-expected/prepare/qemu-server/104.conf
index 2f2ec96c..ff166e25 100644
--- a/test/snapshot-expected/prepare/qemu-server/104.conf
+++ b/test/snapshot-expected/prepare/qemu-server/104.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/prepare/qemu-server/200.conf
b/test/snapshot-expected/prepare/qemu-server/200.conf
index ee3a116b..9a092eaa 100644
--- a/test/snapshot-expected/prepare/qemu-server/200.conf
+++ b/test/snapshot-expected/prepare/qemu-server/200.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
diff --git a/test/snapshot-expected/prepare/qemu-server/201.conf
b/test/snapshot-expected/prepare/qemu-server/201.conf
index 862389b6..45dbdfc4 100644
--- a/test/snapshot-expected/prepare/qemu-server/201.conf
+++ b/test/snapshot-expected/prepare/qemu-server/201.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/prepare/qemu-server/202.conf
b/test/snapshot-expected/prepare/qemu-server/202.conf
index df5e0640..14af147f 100644
--- a/test/snapshot-expected/prepare/qemu-server/202.conf
+++ b/test/snapshot-expected/prepare/qemu-server/202.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/prepare/qemu-server/300.conf
b/test/snapshot-expected/prepare/qemu-server/300.conf
index df5e0640..14af147f 100644
--- a/test/snapshot-expected/prepare/qemu-server/300.conf
+++ b/test/snapshot-expected/prepare/qemu-server/300.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/rollback/qemu-server/101.conf
b/test/snapshot-expected/rollback/qemu-server/101.conf
index 17257e38..e3279e4a 100644
--- a/test/snapshot-expected/rollback/qemu-server/101.conf
+++ b/test/snapshot-expected/rollback/qemu-server/101.conf
@@ -2,7 +2,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -19,7 +19,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/102.conf
b/test/snapshot-expected/rollback/qemu-server/102.conf
index b49d9652..5046d4f6 100644
--- a/test/snapshot-expected/rollback/qemu-server/102.conf
+++ b/test/snapshot-expected/rollback/qemu-server/102.conf
@@ -1,7 +1,7 @@
# this is a description
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/rollback/qemu-server/103.conf
b/test/snapshot-expected/rollback/qemu-server/103.conf
index 6d9cb42d..8e89c91e 100644
--- a/test/snapshot-expected/rollback/qemu-server/103.conf
+++ b/test/snapshot-expected/rollback/qemu-server/103.conf
@@ -1,7 +1,7 @@
# this is a description
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/rollback/qemu-server/104.conf
b/test/snapshot-expected/rollback/qemu-server/104.conf
index de0e2787..ca99303f 100644
--- a/test/snapshot-expected/rollback/qemu-server/104.conf
+++ b/test/snapshot-expected/rollback/qemu-server/104.conf
@@ -1,7 +1,7 @@
# this is a description
bootdisk: ide0
cores: 3
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 3
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -50,7 +50,7 @@ vga: qxl
#another test comment
bootdisk: ide0
cores: 2
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-expected/rollback/qemu-server/105.conf
b/test/snapshot-expected/rollback/qemu-server/105.conf
index b692b3e3..75b35cda 100644
--- a/test/snapshot-expected/rollback/qemu-server/105.conf
+++ b/test/snapshot-expected/rollback/qemu-server/105.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -8,26 +8,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-expected/rollback/qemu-server/106.conf
b/test/snapshot-expected/rollback/qemu-server/106.conf
index 729bc931..72d3a6eb 100644
--- a/test/snapshot-expected/rollback/qemu-server/106.conf
+++ b/test/snapshot-expected/rollback/qemu-server/106.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
@@ -19,7 +19,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/201.conf
b/test/snapshot-expected/rollback/qemu-server/201.conf
index fe632046..8042a713 100644
--- a/test/snapshot-expected/rollback/qemu-server/201.conf
+++ b/test/snapshot-expected/rollback/qemu-server/201.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/202.conf
b/test/snapshot-expected/rollback/qemu-server/202.conf
index d09b5d0f..2f4bda26 100644
--- a/test/snapshot-expected/rollback/qemu-server/202.conf
+++ b/test/snapshot-expected/rollback/qemu-server/202.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/203.conf
b/test/snapshot-expected/rollback/qemu-server/203.conf
index 8abf8419..3f793d42 100644
--- a/test/snapshot-expected/rollback/qemu-server/203.conf
+++ b/test/snapshot-expected/rollback/qemu-server/203.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/204.conf
b/test/snapshot-expected/rollback/qemu-server/204.conf
index ed93cf72..5150b3aa 100644
--- a/test/snapshot-expected/rollback/qemu-server/204.conf
+++ b/test/snapshot-expected/rollback/qemu-server/204.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
lock: backup
memory: 8192
@@ -19,7 +19,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/205.conf
b/test/snapshot-expected/rollback/qemu-server/205.conf
index fe632046..8042a713 100644
--- a/test/snapshot-expected/rollback/qemu-server/205.conf
+++ b/test/snapshot-expected/rollback/qemu-server/205.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/206.conf
b/test/snapshot-expected/rollback/qemu-server/206.conf
index 932bc394..fd7552d2 100644
--- a/test/snapshot-expected/rollback/qemu-server/206.conf
+++ b/test/snapshot-expected/rollback/qemu-server/206.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -8,26 +8,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:unsnapshotable-disk-3,discard=on,size=32G
+sata0: local:unsnapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:unsnapshotable-disk-3,discard=on,size=32G
+sata0: local:unsnapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-expected/rollback/qemu-server/207.conf
b/test/snapshot-expected/rollback/qemu-server/207.conf
index afa062e8..c4ea9195 100644
--- a/test/snapshot-expected/rollback/qemu-server/207.conf
+++ b/test/snapshot-expected/rollback/qemu-server/207.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
lock: rollback
memory: 8192
@@ -9,26 +9,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:snapshotable-disk-4,discard=on,size=32G
+sata0: local:snapshotable-disk-4,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-4,discard=on,size=32G
+sata0: local:snapshotable-disk-4,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-expected/rollback/qemu-server/301.conf
b/test/snapshot-expected/rollback/qemu-server/301.conf
index fe632046..8042a713 100644
--- a/test/snapshot-expected/rollback/qemu-server/301.conf
+++ b/test/snapshot-expected/rollback/qemu-server/301.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/302.conf
b/test/snapshot-expected/rollback/qemu-server/302.conf
index 5110016f..0e6b8bc9 100644
--- a/test/snapshot-expected/rollback/qemu-server/302.conf
+++ b/test/snapshot-expected/rollback/qemu-server/302.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
@@ -19,7 +19,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-expected/rollback/qemu-server/303.conf
b/test/snapshot-expected/rollback/qemu-server/303.conf
index 473a9a0b..796bee34 100644
--- a/test/snapshot-expected/rollback/qemu-server/303.conf
+++ b/test/snapshot-expected/rollback/qemu-server/303.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/commit/qemu-server/101.conf
b/test/snapshot-input/commit/qemu-server/101.conf
index 92c1f6a8..4fa6302c 100644
--- a/test/snapshot-input/commit/qemu-server/101.conf
+++ b/test/snapshot-input/commit/qemu-server/101.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/commit/qemu-server/102.conf
b/test/snapshot-input/commit/qemu-server/102.conf
index 99bca5e0..15e5b7e9 100644
--- a/test/snapshot-input/commit/qemu-server/102.conf
+++ b/test/snapshot-input/commit/qemu-server/102.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/commit/qemu-server/201.conf
b/test/snapshot-input/commit/qemu-server/201.conf
index f8e99dd6..4a902c48 100644
--- a/test/snapshot-input/commit/qemu-server/201.conf
+++ b/test/snapshot-input/commit/qemu-server/201.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/commit/qemu-server/202.conf
b/test/snapshot-input/commit/qemu-server/202.conf
index a221ba04..8917b392 100644
--- a/test/snapshot-input/commit/qemu-server/202.conf
+++ b/test/snapshot-input/commit/qemu-server/202.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/commit/qemu-server/203.conf
b/test/snapshot-input/commit/qemu-server/203.conf
index e10b68e8..bf8abb0f 100644
--- a/test/snapshot-input/commit/qemu-server/203.conf
+++ b/test/snapshot-input/commit/qemu-server/203.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
@@ -17,7 +17,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -33,7 +33,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/create/qemu-server/101.conf
b/test/snapshot-input/create/qemu-server/101.conf
index e89cf9ae..e42467c2 100644
--- a/test/snapshot-input/create/qemu-server/101.conf
+++ b/test/snapshot-input/create/qemu-server/101.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/create/qemu-server/102.conf
b/test/snapshot-input/create/qemu-server/102.conf
index 0fe13593..786da353 100644
--- a/test/snapshot-input/create/qemu-server/102.conf
+++ b/test/snapshot-input/create/qemu-server/102.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/create/qemu-server/103.conf
b/test/snapshot-input/create/qemu-server/103.conf
index 9a320026..99023e93 100644
--- a/test/snapshot-input/create/qemu-server/103.conf
+++ b/test/snapshot-input/create/qemu-server/103.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/create/qemu-server/104.conf
b/test/snapshot-input/create/qemu-server/104.conf
index fe632046..8042a713 100644
--- a/test/snapshot-input/create/qemu-server/104.conf
+++ b/test/snapshot-input/create/qemu-server/104.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/create/qemu-server/105.conf
b/test/snapshot-input/create/qemu-server/105.conf
index 307c9730..1bb4a3c7 100644
--- a/test/snapshot-input/create/qemu-server/105.conf
+++ b/test/snapshot-input/create/qemu-server/105.conf
@@ -1,14 +1,14 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-input/create/qemu-server/106.conf
b/test/snapshot-input/create/qemu-server/106.conf
index 0fe13593..786da353 100644
--- a/test/snapshot-input/create/qemu-server/106.conf
+++ b/test/snapshot-input/create/qemu-server/106.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/create/qemu-server/201.conf
b/test/snapshot-input/create/qemu-server/201.conf
index 19a0b859..bc3083b6 100644
--- a/test/snapshot-input/create/qemu-server/201.conf
+++ b/test/snapshot-input/create/qemu-server/201.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/create/qemu-server/202.conf
b/test/snapshot-input/create/qemu-server/202.conf
index 48e3dc99..c73515aa 100644
--- a/test/snapshot-input/create/qemu-server/202.conf
+++ b/test/snapshot-input/create/qemu-server/202.conf
@@ -1,14 +1,14 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-2,discard=on,size=32G
+sata0: local:snapshotable-disk-2,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:unsnapshotable-disk-1,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-1,discard=on,size=32GiB
diff --git a/test/snapshot-input/create/qemu-server/203.conf
b/test/snapshot-input/create/qemu-server/203.conf
index e89cf9ae..e42467c2 100644
--- a/test/snapshot-input/create/qemu-server/203.conf
+++ b/test/snapshot-input/create/qemu-server/203.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/create/qemu-server/301.conf
b/test/snapshot-input/create/qemu-server/301.conf
index 2731bd1d..243328d2 100644
--- a/test/snapshot-input/create/qemu-server/301.conf
+++ b/test/snapshot-input/create/qemu-server/301.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/create/qemu-server/302.conf
b/test/snapshot-input/create/qemu-server/302.conf
index 2731bd1d..243328d2 100644
--- a/test/snapshot-input/create/qemu-server/302.conf
+++ b/test/snapshot-input/create/qemu-server/302.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/create/qemu-server/303.conf
b/test/snapshot-input/create/qemu-server/303.conf
index 2731bd1d..243328d2 100644
--- a/test/snapshot-input/create/qemu-server/303.conf
+++ b/test/snapshot-input/create/qemu-server/303.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/delete/qemu-server/101.conf
b/test/snapshot-input/delete/qemu-server/101.conf
index fe632046..8042a713 100644
--- a/test/snapshot-input/delete/qemu-server/101.conf
+++ b/test/snapshot-input/delete/qemu-server/101.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/delete/qemu-server/102.conf
b/test/snapshot-input/delete/qemu-server/102.conf
index 198e15ef..08bed4d3 100644
--- a/test/snapshot-input/delete/qemu-server/102.conf
+++ b/test/snapshot-input/delete/qemu-server/102.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/delete/qemu-server/103.conf
b/test/snapshot-input/delete/qemu-server/103.conf
index 198e15ef..08bed4d3 100644
--- a/test/snapshot-input/delete/qemu-server/103.conf
+++ b/test/snapshot-input/delete/qemu-server/103.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/delete/qemu-server/104.conf
b/test/snapshot-input/delete/qemu-server/104.conf
index f07cf44e..8acd7b43 100644
--- a/test/snapshot-input/delete/qemu-server/104.conf
+++ b/test/snapshot-input/delete/qemu-server/104.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 3
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -49,7 +49,7 @@ vga: qxl
#another test comment
bootdisk: ide0
cores: 2
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/delete/qemu-server/105.conf
b/test/snapshot-input/delete/qemu-server/105.conf
index 21ff0ac7..b4bcf4ad 100644
--- a/test/snapshot-input/delete/qemu-server/105.conf
+++ b/test/snapshot-input/delete/qemu-server/105.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/delete/qemu-server/106.conf
b/test/snapshot-input/delete/qemu-server/106.conf
index 9ffdfdab..8a98a2d5 100644
--- a/test/snapshot-input/delete/qemu-server/106.conf
+++ b/test/snapshot-input/delete/qemu-server/106.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -8,26 +8,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:unsnapshotable-disk-2,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:unsnapshotable-disk-2,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-input/delete/qemu-server/201.conf
b/test/snapshot-input/delete/qemu-server/201.conf
index 21ff0ac7..b4bcf4ad 100644
--- a/test/snapshot-input/delete/qemu-server/201.conf
+++ b/test/snapshot-input/delete/qemu-server/201.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -32,7 +32,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/delete/qemu-server/202.conf
b/test/snapshot-input/delete/qemu-server/202.conf
index 9ffdfdab..8a98a2d5 100644
--- a/test/snapshot-input/delete/qemu-server/202.conf
+++ b/test/snapshot-input/delete/qemu-server/202.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -8,26 +8,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:unsnapshotable-disk-2,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:unsnapshotable-disk-2,discard=on,size=32G
+virtio0: local:unsnapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-input/delete/qemu-server/203.conf
b/test/snapshot-input/delete/qemu-server/203.conf
index ed93cf72..5150b3aa 100644
--- a/test/snapshot-input/delete/qemu-server/203.conf
+++ b/test/snapshot-input/delete/qemu-server/203.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
lock: backup
memory: 8192
@@ -19,7 +19,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/delete/qemu-server/204.conf
b/test/snapshot-input/delete/qemu-server/204.conf
index fe632046..8042a713 100644
--- a/test/snapshot-input/delete/qemu-server/204.conf
+++ b/test/snapshot-input/delete/qemu-server/204.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/prepare/qemu-server/101.conf
b/test/snapshot-input/prepare/qemu-server/101.conf
index df5e0640..14af147f 100644
--- a/test/snapshot-input/prepare/qemu-server/101.conf
+++ b/test/snapshot-input/prepare/qemu-server/101.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/prepare/qemu-server/102.conf
b/test/snapshot-input/prepare/qemu-server/102.conf
index df5e0640..14af147f 100644
--- a/test/snapshot-input/prepare/qemu-server/102.conf
+++ b/test/snapshot-input/prepare/qemu-server/102.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/prepare/qemu-server/103.conf
b/test/snapshot-input/prepare/qemu-server/103.conf
index 862389b6..45dbdfc4 100644
--- a/test/snapshot-input/prepare/qemu-server/103.conf
+++ b/test/snapshot-input/prepare/qemu-server/103.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/prepare/qemu-server/104.conf
b/test/snapshot-input/prepare/qemu-server/104.conf
index 862389b6..45dbdfc4 100644
--- a/test/snapshot-input/prepare/qemu-server/104.conf
+++ b/test/snapshot-input/prepare/qemu-server/104.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/prepare/qemu-server/200.conf
b/test/snapshot-input/prepare/qemu-server/200.conf
index ee3a116b..9a092eaa 100644
--- a/test/snapshot-input/prepare/qemu-server/200.conf
+++ b/test/snapshot-input/prepare/qemu-server/200.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
lock: snapshot
memory: 8192
diff --git a/test/snapshot-input/prepare/qemu-server/201.conf
b/test/snapshot-input/prepare/qemu-server/201.conf
index 862389b6..45dbdfc4 100644
--- a/test/snapshot-input/prepare/qemu-server/201.conf
+++ b/test/snapshot-input/prepare/qemu-server/201.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -16,7 +16,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/prepare/qemu-server/202.conf
b/test/snapshot-input/prepare/qemu-server/202.conf
index df5e0640..14af147f 100644
--- a/test/snapshot-input/prepare/qemu-server/202.conf
+++ b/test/snapshot-input/prepare/qemu-server/202.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/prepare/qemu-server/300.conf
b/test/snapshot-input/prepare/qemu-server/300.conf
index df5e0640..14af147f 100644
--- a/test/snapshot-input/prepare/qemu-server/300.conf
+++ b/test/snapshot-input/prepare/qemu-server/300.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: somestore:somedisk,discard=on,size=32G
+ide0: somestore:somedisk,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/rollback/qemu-server/101.conf
b/test/snapshot-input/rollback/qemu-server/101.conf
index 0fa6a61a..582e755f 100644
--- a/test/snapshot-input/rollback/qemu-server/101.conf
+++ b/test/snapshot-input/rollback/qemu-server/101.conf
@@ -2,7 +2,7 @@
agent: 1
bootdisk: ide2
cores: 2
-ide0: local:snapshotable-disk-1,size=32G
+ide0: local:snapshotable-disk-1,size=32GiB
ide2: none,media=cdrom
memory: 4096
name: win
@@ -18,7 +18,7 @@ sockets: 2
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/102.conf
b/test/snapshot-input/rollback/qemu-server/102.conf
index 3fcffe15..aa1c537d 100644
--- a/test/snapshot-input/rollback/qemu-server/102.conf
+++ b/test/snapshot-input/rollback/qemu-server/102.conf
@@ -2,7 +2,7 @@
agent: 1
bootdisk: ide2
cores: 2
-ide0: local:snapshotable-disk-1,size=32G
+ide0: local:snapshotable-disk-1,size=32GiB
ide2: none,media=cdrom
machine: pc
memory: 4096
@@ -18,7 +18,7 @@ sockets: 2
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -34,7 +34,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/rollback/qemu-server/103.conf
b/test/snapshot-input/rollback/qemu-server/103.conf
index 3fcffe15..aa1c537d 100644
--- a/test/snapshot-input/rollback/qemu-server/103.conf
+++ b/test/snapshot-input/rollback/qemu-server/103.conf
@@ -2,7 +2,7 @@
agent: 1
bootdisk: ide2
cores: 2
-ide0: local:snapshotable-disk-1,size=32G
+ide0: local:snapshotable-disk-1,size=32GiB
ide2: none,media=cdrom
machine: pc
memory: 4096
@@ -18,7 +18,7 @@ sockets: 2
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -34,7 +34,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/rollback/qemu-server/104.conf
b/test/snapshot-input/rollback/qemu-server/104.conf
index 2f127619..0036757e 100644
--- a/test/snapshot-input/rollback/qemu-server/104.conf
+++ b/test/snapshot-input/rollback/qemu-server/104.conf
@@ -2,7 +2,7 @@
agent: 1
bootdisk: ide2
cores: 2
-ide0: local:snapshotable-disk-1,size=32G
+ide0: local:snapshotable-disk-1,size=32GiB
ide2: none,media=cdrom
machine: pc
memory: 4096
@@ -18,7 +18,7 @@ sockets: 2
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -34,7 +34,7 @@ vga: qxl
#test comment
bootdisk: ide0
cores: 3
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -51,7 +51,7 @@ vga: qxl
#another test comment
bootdisk: ide0
cores: 2
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
diff --git a/test/snapshot-input/rollback/qemu-server/105.conf
b/test/snapshot-input/rollback/qemu-server/105.conf
index b692b3e3..75b35cda 100644
--- a/test/snapshot-input/rollback/qemu-server/105.conf
+++ b/test/snapshot-input/rollback/qemu-server/105.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -8,26 +8,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-3,discard=on,size=32G
+sata0: local:snapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-input/rollback/qemu-server/106.conf
b/test/snapshot-input/rollback/qemu-server/106.conf
index 56d7199a..32e71980 100644
--- a/test/snapshot-input/rollback/qemu-server/106.conf
+++ b/test/snapshot-input/rollback/qemu-server/106.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: pc
memory: 8192
@@ -19,7 +19,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/201.conf
b/test/snapshot-input/rollback/qemu-server/201.conf
index fe632046..8042a713 100644
--- a/test/snapshot-input/rollback/qemu-server/201.conf
+++ b/test/snapshot-input/rollback/qemu-server/201.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/202.conf
b/test/snapshot-input/rollback/qemu-server/202.conf
index d09b5d0f..2f4bda26 100644
--- a/test/snapshot-input/rollback/qemu-server/202.conf
+++ b/test/snapshot-input/rollback/qemu-server/202.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:unsnapshotable-disk-1,discard=on,size=32G
+ide0: local:unsnapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/203.conf
b/test/snapshot-input/rollback/qemu-server/203.conf
index 8abf8419..3f793d42 100644
--- a/test/snapshot-input/rollback/qemu-server/203.conf
+++ b/test/snapshot-input/rollback/qemu-server/203.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/204.conf
b/test/snapshot-input/rollback/qemu-server/204.conf
index ed93cf72..5150b3aa 100644
--- a/test/snapshot-input/rollback/qemu-server/204.conf
+++ b/test/snapshot-input/rollback/qemu-server/204.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
lock: backup
memory: 8192
@@ -19,7 +19,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/205.conf
b/test/snapshot-input/rollback/qemu-server/205.conf
index fe632046..8042a713 100644
--- a/test/snapshot-input/rollback/qemu-server/205.conf
+++ b/test/snapshot-input/rollback/qemu-server/205.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/206.conf
b/test/snapshot-input/rollback/qemu-server/206.conf
index 932bc394..fd7552d2 100644
--- a/test/snapshot-input/rollback/qemu-server/206.conf
+++ b/test/snapshot-input/rollback/qemu-server/206.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -8,26 +8,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:unsnapshotable-disk-3,discard=on,size=32G
+sata0: local:unsnapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:unsnapshotable-disk-3,discard=on,size=32G
+sata0: local:unsnapshotable-disk-3,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-input/rollback/qemu-server/207.conf
b/test/snapshot-input/rollback/qemu-server/207.conf
index 7787ea76..b06fcb38 100644
--- a/test/snapshot-input/rollback/qemu-server/207.conf
+++ b/test/snapshot-input/rollback/qemu-server/207.conf
@@ -1,6 +1,6 @@
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -8,26 +8,26 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
parent: test
-sata0: local:snapshotable-disk-4,discard=on,size=32G
+sata0: local:snapshotable-disk-4,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
[test]
#test comment
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
numa: 0
ostype: win7
-sata0: local:snapshotable-disk-4,discard=on,size=32G
+sata0: local:snapshotable-disk-4,discard=on,size=32GiB
smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
snaptime: 1234567890
sockets: 1
vga: qxl
-virtio0: local:snapshotable-disk-2,discard=on,size=32G
+virtio0: local:snapshotable-disk-2,discard=on,size=32GiB
diff --git a/test/snapshot-input/rollback/qemu-server/301.conf
b/test/snapshot-input/rollback/qemu-server/301.conf
index fe632046..8042a713 100644
--- a/test/snapshot-input/rollback/qemu-server/301.conf
+++ b/test/snapshot-input/rollback/qemu-server/301.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/302.conf
b/test/snapshot-input/rollback/qemu-server/302.conf
index 473a9a0b..796bee34 100644
--- a/test/snapshot-input/rollback/qemu-server/302.conf
+++ b/test/snapshot-input/rollback/qemu-server/302.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/snapshot-input/rollback/qemu-server/303.conf
b/test/snapshot-input/rollback/qemu-server/303.conf
index 473a9a0b..796bee34 100644
--- a/test/snapshot-input/rollback/qemu-server/303.conf
+++ b/test/snapshot-input/rollback/qemu-server/303.conf
@@ -1,7 +1,7 @@
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
memory: 8192
name: win
@@ -18,7 +18,7 @@ vga: qxl
agent: 1
bootdisk: ide0
cores: 4
-ide0: local:snapshotable-disk-1,discard=on,size=32G
+ide0: local:snapshotable-disk-1,discard=on,size=32GiB
ide2: none,media=cdrom
machine: q35
memory: 8192
diff --git a/test/test_get_replicatable_volumes.pl
b/test/test_get_replicatable_volumes.pl
index d90e4f8a..9869b754 100755
--- a/test/test_get_replicatable_volumes.pl
+++ b/test/test_get_replicatable_volumes.pl
@@ -40,7 +40,7 @@ my $storecfg = {
my $vmid = 900;
-my $rawconf = "scsi0: non-existent-store:vm-103-disk-1,size=8G\n";
+my $rawconf = "scsi0: non-existent-store:vm-103-disk-1,size=8GiB\n";
my $conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf",
$rawconf);
my $volumes;
@@ -54,7 +54,7 @@ is($@, "storage 'non-existent-store' does not exist\n",
$test_name);
$test_name = "test with disk from other VM (not owner)";
-$rawconf = "scsi0: local:103/vm-103-disk-1.qcow2,size=8G\n";
+$rawconf = "scsi0: local:103/vm-103-disk-1.qcow2,size=8GiB\n";
$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
$volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf,
0, 0);
@@ -63,7 +63,7 @@ is_deeply($volumes, {}, $test_name);
$test_name = "test missing replicate feature";
-$rawconf = "scsi0: local:$vmid/vm-$vmid-disk-1.qcow2,size=8G\n";
+$rawconf = "scsi0: local:$vmid/vm-$vmid-disk-1.qcow2,size=8GiB\n";
$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
eval { $volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid,
$conf, 0, 0); };
@@ -72,7 +72,7 @@ is($@, "missing replicate feature on volume
'local:900/vm-900-disk-1.qcow2'\n",
$test_name = "test raw path disk with replicate enabled";
-$rawconf = "scsi0: /dev/disk/abcdefg,size=8G\n";
+$rawconf = "scsi0: /dev/disk/abcdefg,size=8GiB\n";
$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
eval { $volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid,
$conf, 0, 0); };
@@ -81,7 +81,7 @@ is($@, "unable to replicate local file/device
'/dev/disk/abcdefg'\n", $test_name
$test_name = "test raw path disk with replicate disabled";
-$rawconf = "scsi0: /dev/disk/abcdefg,size=8G,replicate=0\n";
+$rawconf = "scsi0: /dev/disk/abcdefg,size=8GiB,replicate=0\n";
$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
$volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf,
0, 0);
@@ -110,10 +110,10 @@ $test_name = "test hidden volid in snapshot";
$rawconf = <<__EOD__;
memory: 1024
-scsi0: local-zfs:vm-$vmid-disk-2,size=8G
+scsi0: local-zfs:vm-$vmid-disk-2,size=8GiB
[snap1]
memory: 512
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G
+scsi0: local-zfs:vm-$vmid-disk-1,size=8GiB
__EOD__
$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
@@ -128,10 +128,10 @@ is_deeply($volumes, $expect, $test_name);
$test_name = "test volid with different replicate setting in snapshot";
$rawconf = <<__EOD__;
memory: 1024
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G,replicate=0
+scsi0: local-zfs:vm-$vmid-disk-1,size=8GiB,replicate=0
[snap1]
memory: 512
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G
+scsi0: local-zfs:vm-$vmid-disk-1,size=8GiB
__EOD__
$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
@@ -145,7 +145,7 @@ is_deeply($volumes, $expect, $test_name);
$test_name = "test vm with replicatable unused volumes";
$rawconf = <<__EOD__;
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G
+scsi0: local-zfs:vm-$vmid-disk-1,size=8GiB
unused1: local-zfs:vm-$vmid-disk-2
unused5: local-zfs:vm-$vmid-disk-3
__EOD__
@@ -162,7 +162,7 @@ is_deeply($volumes, $expect, $test_name);
$test_name = "test vm with non-replicatable unused volumes";
$rawconf = <<__EOD__;
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G
+scsi0: local-zfs:vm-$vmid-disk-1,size=8GiB
unused1: local:$vmid/vm-$vmid-disk-2.raw
__EOD__
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
