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 419F48E34 for ; Wed, 16 Nov 2022 18:14:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1F62D232A5 for ; Wed, 16 Nov 2022 18:14:12 +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 for ; Wed, 16 Nov 2022 18:14:11 +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 C362C44D6F; Wed, 16 Nov 2022 18:14:09 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 16 Nov 2022 18:14:07 +0100 Message-Id: <20221116171408.216775-6-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221116171408.216775-1-w.bumiller@proxmox.com> References: <20221116171408.216775-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.232 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 5/6] don't call 'cleanup_config' the cloudinit section 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: Wed, 16 Nov 2022 17:14:42 -0000 It performs schema valdiation (and normalization). We only ever write values into it which came from an already validated config, and we also add an additional "added" key which is not covered by the schema, so this would fail. Simply skip it. Signed-off-by: Wolfgang Bumiller --- PVE/QemuServer.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 6053d6c..90cedea 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2573,8 +2573,6 @@ sub write_vm_config { &$cleanup_config($conf->{pending}, 1); - &$cleanup_config($conf->{cloudinit}); - foreach my $snapname (keys %{$conf->{snapshots}}) { die "internal error: snapshot name '$snapname' is forbidden" if lc($snapname) eq 'pending'; &$cleanup_config($conf->{snapshots}->{$snapname}, undef, $snapname); -- 2.30.2