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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D19F9A1F59 for ; Fri, 16 Jun 2023 14:25:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B255F32CE5 for ; Fri, 16 Jun 2023 14:25:14 +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 for ; Fri, 16 Jun 2023 14:25:14 +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 F0B4A45B3A for ; Fri, 16 Jun 2023 14:25:13 +0200 (CEST) Message-ID: <2f34f821-343b-3d4e-b3cd-0e8a63c9c29f@proxmox.com> Date: Fri, 16 Jun 2023 14:25:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US To: Proxmox VE development discussion , Aaron Lauterer References: <20230616095708.1323621-1-a.lauterer@proxmox.com> <20230616095708.1323621-3-a.lauterer@proxmox.com> From: Fiona Ebner In-Reply-To: <20230616095708.1323621-3-a.lauterer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.098 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH v4 qemu-server 2/12] qemuserver: foreach_volid: include pending volumes 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: Fri, 16 Jun 2023 12:25:44 -0000 Am 16.06.23 um 11:56 schrieb Aaron Lauterer: > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index 6cbaf87..33acef6 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -2424,7 +2424,7 @@ sub destroy_vm { > > if ($purge_unreferenced) { # also remove unreferenced disk > my $vmdisks = PVE::Storage::vdisk_list($storecfg, undef, $vmid, undef, 'images'); > - PVE::Storage::foreach_volid($vmdisks, sub { > + PVE::Storage::foreach_volid($vmdisks, 1, sub { This is a different function. > my ($volid, $sid, $volname, $d) = @_; > eval { PVE::Storage::vdisk_free($storecfg, $volid) }; > warn $@ if $@; (...) > @@ -4902,6 +4904,11 @@ sub foreach_volid { > }; > > PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $test_volid); > + > + if ($include_pending && defined($conf->{pending}) && $conf->{pending}->%*) { > + PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $test_volid, undef, 1); > + } Style nit: wouldn't be 101 chars as a post-if ;) > + > foreach my $snapname (keys %{$conf->{snapshots}}) { > my $snap = $conf->{snapshots}->{$snapname}; > PVE::QemuConfig->foreach_volume_full($snap, $include_opts, $test_volid, $snapname);