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 375EBA1D17 for ; Fri, 16 Jun 2023 11:57:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1D81F30A7E for ; Fri, 16 Jun 2023 11:57:10 +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 11:57:09 +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 4CCA445BD3 for ; Fri, 16 Jun 2023 11:57:09 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Fri, 16 Jun 2023 11:57:00 +0200 Message-Id: <20230616095708.1323621-5-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616095708.1323621-1-a.lauterer@proxmox.com> References: <20230616095708.1323621-1-a.lauterer@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% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 qemu-server 4/12] qemuserver: foreach_volid: test regular config last 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 09:57:10 -0000 after snapshots and the pending section to make sure, that volids that are referenced here, will be marked correctly, e.g. 'is_unused'. Signed-off-by: Aaron Lauterer --- changes since v3: new patch and change, wasn't there before PVE/QemuServer.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index d485495..86f8f10 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4903,8 +4903,6 @@ sub foreach_volid { include_unused => 1, }; - PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $test_volid); - if (defined($conf->{pending}) && $conf->{pending}->%*) { PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $test_volid, undef, 1); } @@ -4914,6 +4912,8 @@ sub foreach_volid { PVE::QemuConfig->foreach_volume_full($snap, $include_opts, $test_volid, $snapname); } + PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $test_volid); + foreach my $volid (keys %$volhash) { &$func($volid, $volhash->{$volid}, @param); } -- 2.39.2