From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 7ECC41FF0E6 for ; Fri, 07 Aug 2026 11:33:34 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id AFC4D214BE; Fri, 07 Aug 2026 11:33:33 +0200 (CEST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Fri, 07 Aug 2026 11:33:30 +0200 Message-Id: To: "Thomas Ellmenreich" , From: "Max R. Carrara" Subject: Re: [PATCH qemu-server v2 3/3] removed some unnecessary undef checks. X-Mailer: aerc 0.18.2-0-ge037c095a049 References: <20260805082122.43184-1-t.ellmenreich@proxmox.com> <20260805082122.43184-4-t.ellmenreich@proxmox.com> In-Reply-To: <20260805082122.43184-4-t.ellmenreich@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1786095195096 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.782 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: AA3H7HWJ7V5TDV24J7DP27QTTPHG7PJ7 X-Message-ID-Hash: AA3H7HWJ7V5TDV24J7DP27QTTPHG7PJ7 X-MailFrom: m.carrara@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ^ Small note regarding commit summaries and messages: We use present tense with active voice / imperative mood and don't add any fullstops in summaries. So, the summary line should instead say: remove some unnecessary undef checks IMO this can be changed when applying the patch, no need for a refresh here either. On Wed Aug 5, 2026 at 10:21 AM CEST, Thomas Ellmenreich wrote: > Signed-off-by: Thomas Ellmenreich > --- > 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 0e998cbe..3141b298 100644 > --- a/src/PVE/QemuServer.pm > +++ b/src/PVE/QemuServer.pm > @@ -1818,11 +1818,10 @@ sub destroy_vm { > { include_unused =3D> 1 }, > sub { > my ($ds, $drive) =3D @_; > - return if drive_is_cdrom($drive); > > - my $volid =3D $drive->{file}; > - return if !$volid || drive_has_absolute_path($drive); > + return if drive_is_cdrom($drive) || drive_has_absolute_p= ath($drive); > > + my $volid =3D $drive->{file}; > my $result =3D eval { PVE::Storage::volume_is_base_and_u= sed($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: $@") > @@ -1839,8 +1838,7 @@ sub destroy_vm { > return if drive_is_cdrom($drive, 1); > > my $volid =3D $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) =3D eval { PVE::Storage::path($storecfg, $vol= id) }; > log_warn("failed to get path and owner of volume '$volid': $@") = if $@; > @@ -6510,11 +6508,9 @@ my $restore_cleanup_oldconf =3D sub { > sub { > my ($ds, $drive) =3D @_; > > - return if drive_is_cdrom($drive, 1); > + return if drive_is_cdrom($drive, 1) || drive_has_absolute_pa= th($drive); > > my $volid =3D $drive->{file}; > - return if !$volid || drive_has_absolute_path($drive); > - > my ($path, $owner) =3D PVE::Storage::path($storecfg, $volid)= ; > return if !$path || !$owner || ($owner !=3D $vmid); >