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 88C129EC5E for ; Fri, 3 Nov 2023 12:53:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 71CAB1C924 for ; Fri, 3 Nov 2023 12:53:48 +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 ; Fri, 3 Nov 2023 12:53:44 +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 44DFD4427E for ; Fri, 3 Nov 2023 12:53:44 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 3 Nov 2023 12:53:36 +0100 Message-Id: <20231103115343.4133611-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231103115343.4133611-1-d.csapak@proxmox.com> References: <20231103115343.4133611-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.017 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] [RFC PATCH qemu-server 1/4] meta info: allow additional properties to be given 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, 03 Nov 2023 11:53:48 -0000 we'll need this since we want to record the profile used for creation, which we get from outside Signed-off-by: Dominik Csapak --- PVE/QemuServer.pm | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 0568b2bc..c22b1544 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2125,15 +2125,22 @@ sub parse_meta_info { } sub new_meta_info_string { - my () = @_; # for now do not allow to override any value + my ($additional_props) = @_; - return PVE::JSONSchema::print_property_string( - { - 'creation-qemu' => kvm_user_version(), - ctime => "". int(time()), - }, - $meta_info_fmt - ); + $additional_props //= {}; + + # for now do not allow to override any value + delete $additional_props->{'creation-qemu'}; + delete $additional_props->{'ctime'}; + + my $opts = { + 'creation-qemu' => kvm_user_version(), + ctime => "". int(time()), + }; + + $opts->{$_} = $additional_props->{$_} for keys $additional_props->%*; + + return PVE::JSONSchema::print_property_string($opts, $meta_info_fmt); } sub qemu_created_version_fixups { -- 2.30.2