From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 610B81FF12C for ; Wed, 05 Aug 2026 10:21:40 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 32BA921797; Wed, 05 Aug 2026 10:21:40 +0200 (CEST) From: Thomas Ellmenreich To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 3/3] removed some unnecessary undef checks. Date: Wed, 5 Aug 2026 10:21:22 +0200 Message-ID: <20260805082122.43184-4-t.ellmenreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260805082122.43184-1-t.ellmenreich@proxmox.com> References: <20260805082122.43184-1-t.ellmenreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1785918083320 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.071 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_LOW -0.7 Sender listed at https://www.dnswl.org/, low 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: VZSSKQW5GDTEH3GAH2CJRQV2BPS2ETFN X-Message-ID-Hash: VZSSKQW5GDTEH3GAH2CJRQV2BPS2ETFN X-MailFrom: t.ellmenreich@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 CC: Thomas Ellmenreich X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 => 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: $@") @@ -1839,8 +1838,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 $@; @@ -6510,11 +6508,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); -- 2.47.3