Re: [PATCH qemu-server 1/3] moved verify_volume_id_or_* format registrations

["Elias Huhsovitz" <e.huhsovitz@proxmox.com>]

Good change. The QemuServer.pm is quite long and this refactor makes
sense. One small nit inline, otherwise consider this:

Reviewed-by: Elias Huhsovitz <e.huhsovitz@proxmox.com>

On Mon Aug 3, 2026 at 2:12 PM CEST, Thomas Ellmenreich wrote:
> The format registrations of verify_volume_id_or_qm_path and
> verify_volume_id_or_absolute_path were moved from QemuServer to
> QemuServer::Drive, which is a more fitting location.

nit: Commit messages should be written in imperative.

e.g., "move verify_volume_id_or_* format registrations from X to Y"
instead of "verify_volume_id_or_* were moved from X to Y"

> Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
> ---
>  src/PVE/QemuServer.pm       | 28 ----------------------------
>  src/PVE/QemuServer/Drive.pm | 28 ++++++++++++++++++++++++++++
>  2 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
> index 9aec7f9c..fdef20dc 100644
> --- a/src/PVE/QemuServer.pm
> +++ b/src/PVE/QemuServer.pm
> @@ -895,34 +895,6 @@ sub pve_verify_cpuset {
>      return PVE::CpuSet->new($members)->short_string();
>  }
>  
> -PVE::JSONSchema::register_format('pve-volume-id-or-qm-path', \&verify_volume_id_or_qm_path);
> -
> -sub verify_volume_id_or_qm_path {
> -    my ($volid, $noerr) = @_;
> -
> -    return $volid if $volid eq 'none' || $volid eq 'cdrom';
> -
> -    return verify_volume_id_or_absolute_path($volid, $noerr);
> -}
> -
> -PVE::JSONSchema::register_format(
> -    'pve-volume-id-or-absolute-path',
> -    \&verify_volume_id_or_absolute_path,
> -);
> -
> -sub verify_volume_id_or_absolute_path {
> -    my ($volid, $noerr) = @_;
> -
> -    return $volid if $volid =~ m|^/|;
> -
> -    $volid = eval { PVE::JSONSchema::check_format('pve-volume-id', $volid, '') };
> -    if ($@) {
> -        return if $noerr;
> -        die $@;
> -    }
> -    return $volid;
> -}
> -
>  my $serialdesc = {
>      optional => 1,
>      type => 'string',
> diff --git a/src/PVE/QemuServer/Drive.pm b/src/PVE/QemuServer/Drive.pm
> index b80b7dbb..52e4a89b 100644
> --- a/src/PVE/QemuServer/Drive.pm
> +++ b/src/PVE/QemuServer/Drive.pm
> @@ -753,6 +753,34 @@ sub verify_bootdisk {
>      die "invalid boot disk '$value'\n";
>  }
>  
> +PVE::JSONSchema::register_format('pve-volume-id-or-qm-path', \&verify_volume_id_or_qm_path);
> +
> +sub verify_volume_id_or_qm_path {
> +    my ($volid, $noerr) = @_;
> +
> +    return $volid if $volid eq 'none' || $volid eq 'cdrom';
> +
> +    return verify_volume_id_or_absolute_path($volid, $noerr);
> +}
> +
> +PVE::JSONSchema::register_format(
> +    'pve-volume-id-or-absolute-path',
> +    \&verify_volume_id_or_absolute_path,
> +);
> +
> +sub verify_volume_id_or_absolute_path {
> +    my ($volid, $noerr) = @_;
> +
> +    return $volid if $volid =~ m|^/|;
> +
> +    $volid = eval { PVE::JSONSchema::check_format('pve-volume-id', $volid, '') };
> +    if ($@) {
> +        return if $noerr;
> +        die $@;
> +    }
> +    return $volid;
> +}
> +
>  sub drive_is_cloudinit {
>      my ($drive) = @_;
>      return $drive->{file} =~ m@[:/](?:vm-\d+-)?cloudinit(?:\.$QEMU_FORMAT_RE)?$@;