Re: [PATCH qemu-server v3 3/3] remove unnecessary undef checks

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

I tested this patch by in injecting
die "ASSERT: undefined or empty drive file for '$ds'\n"
                    if !defined($volid) || $volid eq '';

Then i created/destroyed/restored on the default 'local' and 
'local-lvm' storages.

Valid configurations never caused $volid to be undef.

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

On Wed Aug 12, 2026 at 2:13 PM CEST, Thomas Ellmenreich wrote:
> The surrounding code guarantees that the value is always defined,
> making these checks unnecessary.
>
> Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
> ---
>  src/PVE/QemuServer.pm | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
> index d9d76ab3..0bedd334 100644
> --- a/src/PVE/QemuServer.pm
> +++ b/src/PVE/QemuServer.pm
> @@ -1831,11 +1831,10 @@ sub destroy_vm {
>              { include_unused => 1 },
>              sub {
>                  my ($ds, $drive) = @_;
> -                return if drive_is_cdrom($drive);
>  
> -                my $volid = $drive->{file};
> -                return if !$volid || drive_has_absolute_path($drive);
> +                return if drive_is_cdrom($drive) || drive_has_absolute_path($drive);
>  
> +                my $volid = $drive->{file};
>                  my $result = eval { PVE::Storage::volume_is_base_and_used($storecfg, $volid) };
>                  # early check, removal of volume will fail later anyway, so warning here is fine
>                  log_warn("failed to check if volume '$volid' is used by linked clones: $@")
> @@ -1852,8 +1851,7 @@ sub destroy_vm {
>          return if drive_is_cdrom($drive, 1);
>  
>          my $volid = $drive->{file};
> -        return if !$volid || drive_has_absolute_path($drive);
> -        return if $volids->{$volid};
> +        return if drive_has_absolute_path($drive) || $volids->{$volid};
>  
>          my ($path, $owner) = eval { PVE::Storage::path($storecfg, $volid) };
>          log_warn("failed to get path and owner of volume '$volid': $@") if $@;
> @@ -6523,11 +6521,9 @@ my $restore_cleanup_oldconf = sub {
>          sub {
>              my ($ds, $drive) = @_;
>  
> -            return if drive_is_cdrom($drive, 1);
> +            return if drive_is_cdrom($drive, 1) || drive_has_absolute_path($drive);
>  
>              my $volid = $drive->{file};
> -            return if !$volid || drive_has_absolute_path($drive);
> -
>              my ($path, $owner) = PVE::Storage::path($storecfg, $volid);
>              return if !$path || !$owner || ($owner != $vmid);
>