Am 11.02.25 um 17:08 schrieb Daniel Kral:
> Since 0541eeb8 ("use property strings for drive options") the user input
> of a volume with allocation support must be a pair of a PVE-managed
> storage and an arbitrary string (i.e. the volume name or the size of a
> new disk in GB) [0]. Therefore, the `$volid` must always be the string
> "$storeid:$volname_or_size" for cloudinit images and new disks.
> Therefore, the `$default_storage` parameter is redundant.
>
> Remove it as it is rejected by `verify_volume_id_or_qm_path` for
> allocatable disk drives before calling this subroutine anyway, which is
> used by both API handlers, i.e. `create_vm` and `update_vm`, that call
> the subroutine.
>
> [0] except the special cases "none", "cdrom" and absolute paths, which
> were introduced some time later with `pve-volume-id-or-absolute-path`
> and `pve-volume-id-or-qm-path`.
>
> Signed-off-by: Daniel Kral <d.k...@proxmox.com>
> ---
> changes since v1:
> - new!
>
> PVE/API2/Qemu.pm | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 5ac61aa5..2a2d971e 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -133,7 +133,7 @@ my $check_drive_param = sub {
> };
>
> my $check_storage_access = sub {
> - my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage,
> $extraction_storage) = @_;
> + my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $extraction_storage)
> = @_;
>
> $foreach_volume_with_alloc->($settings, sub {
> my ($ds, $drive) = @_;
> @@ -143,13 +143,11 @@ my $check_storage_access = sub {
> my $volid = $drive->{file};
> my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
>
> - if (!$volid || ($volid eq 'none' || $volid eq 'cloudinit' ||
> (defined($volname) && $volname eq 'cloudinit'))) {
> + if (!$volid || ($volid eq 'none' || (defined($volname) && $volname eq
> 'cloudinit'))) {
> # nothing to check
> } elsif ($isCDROM && ($volid eq 'cdrom')) {
> $rpcenv->check($authuser, "/", ['Sys.Console']);
> } elsif (!$isCDROM && ($volid =~ $PVE::QemuServer::Drive::NEW_DISK_RE))
> {
> - my $storeid = $2 || $default_storage;
The rest looks fine, but I'd rather keep the assignment with the result
from the regex match here. Because otherwise, the code would rely on
parse_volume_id() to work for everything matching the regex and that is
a pretty implicit assumption and might not stay true in the future.
> - die "no storage ID specified (and no default storage)\n" if
> !$storeid;
> $rpcenv->check($authuser, "/storage/$storeid",
> ['Datastore.AllocateSpace']);
> my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
> raise_param_exc({ storage => "storage '$storeid' does not support
> vm images"})
> @@ -1106,8 +1104,7 @@ __PACKAGE__->register_method({
> if (scalar(keys $param->%*) > 0) {
> &$resolve_cdrom_alias($param);
>
> - &$check_storage_access(
> - $rpcenv, $authuser, $storecfg, $vmid, $param, $storage,
> $extraction_storage);
> + &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid,
> $param, $extraction_storage);
>
> &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [
> keys %$param]);
>
> @@ -1874,7 +1871,7 @@ my $update_vm_api = sub {
>
> &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [keys
> %$param]);
>
> - &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param,
> undef, $extraction_storage);
> + &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param,
> $extraction_storage);
>
> PVE::QemuServer::check_bridge_access($rpcenv, $authuser, $param);
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
