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 7A0B9608E5 for ; Thu, 13 Jan 2022 12:04:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 76CE51D133 for ; Thu, 13 Jan 2022 12:04:11 +0100 (CET) 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 A10001D120 for ; Thu, 13 Jan 2022 12:04:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 78FD146021 for ; Thu, 13 Jan 2022 12:04:10 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 13 Jan 2022 12:04:04 +0100 Message-Id: <20220113110405.67232-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220113110405.67232-1-f.ebner@proxmox.com> References: <20220113110405.67232-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.137 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [config.pm] Subject: [pve-devel] [PATCH v2 container 2/3] config: parse_volume: don't die when noerr is set 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, 13 Jan 2022 11:04:11 -0000 AFAICT, the only existing callers using noerr=1 are in __snapshot_delete_remove_drive, and in AbstractConfig's foreach_volume_full. The former should not be affected, as unknown keys should never make their way in there. For the latter, it makes iterating with $opts = { extra_keys => ['vmstate'] } possible while being agnostic of guest type. Previously, it would die for LXC configs, but now the unknown key is simply skipped there. Signed-off-by: Fabian Ebner --- src/PVE/LXC/Config.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index 32d990c..7db023c 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -1191,7 +1191,9 @@ sub parse_volume { return $parse_ct_mountpoint_full->($class, $unused_desc, $volume_string, $noerr); } - die "parse_volume - unknown type: $key\n"; + die "parse_volume - unknown type: $key\n" if !$noerr; + + return; } sub print_volume { -- 2.30.2