From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1F114E130 for ; Thu, 21 Apr 2022 13:27:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 184361E23D for ; Thu, 21 Apr 2022 13:27:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 05FA61E210 for ; Thu, 21 Apr 2022 13:27:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CFDC742689 for ; Thu, 21 Apr 2022 13:27:05 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 21 Apr 2022 13:26:50 +0200 Message-Id: <20220421112659.74011-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220421112659.74011-1-f.ebner@proxmox.com> References: <20220421112659.74011-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.089 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 qemu-server 2/7] restore destroy volumes: remove check for absolute path X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2022 11:27:07 -0000 Only a result from vdisk_alloc is assigned as a volid and that's never an absolute path. Signed-off-by: Fabian Ebner --- No changes from v1. PVE/QemuServer.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index f221d93c..be0694f9 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6470,11 +6470,7 @@ my $restore_destroy_volumes = sub { my $volid = $devinfo->{$devname}->{volid}; next if !$volid; eval { - if ($volid =~ m|^/|) { - unlink $volid || die 'unlink failed\n'; - } else { - PVE::Storage::vdisk_free($storecfg, $volid); - } + PVE::Storage::vdisk_free($storecfg, $volid); print STDERR "temporary volume '$volid' sucessfuly removed\n"; }; print STDERR "unable to cleanup '$volid' - $@" if $@; -- 2.30.2