Re: [PATCH qemu-server 2/5] drive: update TPM size on creation

[Fiona Ebner <f.ebner@proxmox.com>]

The commit subject should start out with "api: create disks:"

Am 19.10.26 um 11:53 AM schrieb Thomas Ellmenreich:
> When creating a TPM drive, the default size is 4MiB. This default is
> constant and cannot be changed, unless the backing storage has a bigger
> granularity, in which case it is forcibly changed to the bigger size.
> 
> To directly show the correct size of a TPM drive, query its size after
> creation, and set that as the drive size.
> 
> Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
> Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>

With the commit subject and nits addressed:
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>

> ---
>  src/PVE/API2/Qemu.pm | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
> index cfbc1f51..e42cad74 100644
> --- a/src/PVE/API2/Qemu.pm
> +++ b/src/PVE/API2/Qemu.pm
> @@ -665,13 +665,21 @@ my sub create_disks : prototype($$$$$$$$$$$) {
>                          $storecfg, $storeid, $vmid, $fmt, $arch, $disk, $smm, $cvm_type,
>                      );
>                  } elsif ($ds eq 'tpmstate0') {
> -                    # A fixed size is used for TPM state volumes
> -                    $size = PVE::Tools::convert_size(
> +

Style nit: blank line here is inconsistent with the surrounding style

> +                    # A fixed size is requested for TPM state volumes, but the
> +                    # storage might increase it up to its allocation granularity
> +                    my $target_size = PVE::Tools::convert_size(
>                          PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE,
>                          'b' => 'kb',
>                      );
> -                    $volid =
> -                        PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, undef, $size);
> +

Style nit: I'd drop this blank too, since otherwise the first bit with
the comment feels a bit detached

> +                    $volid = PVE::Storage::vdisk_alloc(
> +                        $storecfg, $storeid, $vmid, $fmt, undef, $target_size,
> +                    );
> +                    $size = PVE::Tools::convert_size(
> +                        PVE::QemuServer::get_tpmstate_size($volid, $storecfg),
> +                        'b' => 'kb',
> +                    );
>                  } else {
>                      $volid =
>                          PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, undef, $size);