[pve-devel] [PATCH qemu-server] api: create disks: also convert tpmstate and efidisk to base image for templates

[pve-devel] [PATCH qemu-server] api: create disks: also convert tpmstate and efidisk to base image for templates

[Daniel Kral]

The commit 37a1f42a introduced a conversion step for newly allocated
volume disks to base volumes for VM templates. This wrongly excluded
efidisk and tmpstate volumes from this conversion, even though those
should be converted to base volumes too.

Therefore, include efidisks and tpmstate volumes to be converted to base
volumes when newly allocating them.

Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
Fixes: 37a1f42a ("fix #5301: convert added volume disks to base images for templates")
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
I tested these changes in the same way as the patch, which introduced
this behavior [0] with the small obvious change, that efidisk0 and
tpmstate0 should now be converted to base volume images instead as well:

```
55,56c55,56
< test_qmset "efidisk0" "$TEST_STORAGE:1,efitype=4m,pre-enrolled-keys=1" "base"
< test_qmset "tpmstate0" "$TEST_STORAGE:1,version=v2.0" "base"
---
> test_qmset "efidisk0" "$TEST_STORAGE:1,efitype=4m,pre-enrolled-keys=1" "vm"
> test_qmset "tpmstate0" "$TEST_STORAGE:1,version=v2.0" "vm"
```

[0] https://lore.proxmox.com/pve-devel/20241017115124.75539-3-d.kral@proxmox.com/

 PVE/API2/Qemu.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index db356b7e..8392400e 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -554,11 +554,12 @@ my sub create_disks : prototype($$$$$$$$$$$) {
 		    $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, "raw", undef, $size);
 		} else {
 		    $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, undef, $size);
-
-		    # change created disk to a base volume in case the VM is a template
-		    $volid = PVE::Storage::vdisk_create_base($storecfg, $volid)
-			if PVE::QemuConfig->is_template($conf);
 		}
+
+		# change created disk to a base volume in case the VM is a template
+		$volid = PVE::Storage::vdisk_create_base($storecfg, $volid)
+		    if PVE::QemuConfig->is_template($conf);
+
 		push @$vollist, $volid;
 		$disk->{file} = $volid;
 		$disk->{size} = PVE::Tools::convert_size($size, 'kb' => 'b');
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH qemu-server] api: create disks: also convert tpmstate and efidisk to base image for templates

[Fiona Ebner]

Am 10.01.25 um 18:05 schrieb Daniel Kral:
> The commit 37a1f42a introduced a conversion step for newly allocated
> volume disks to base volumes for VM templates. This wrongly excluded
> efidisk and tmpstate volumes from this conversion, even though those
> should be converted to base volumes too.
> 
> Therefore, include efidisks and tpmstate volumes to be converted to base
> volumes when newly allocating them.
> 
> Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
> Fixes: 37a1f42a ("fix #5301: convert added volume disks to base images for templates")
> Signed-off-by: Daniel Kral <d.kral@proxmox.com>

applied, thanks!


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel