From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D8EC81FF14C for ; Fri, 15 May 2026 11:30:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7519014DDB; Fri, 15 May 2026 11:29:17 +0200 (CEST) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v5 11/21] custom cpu models: avoid redundant config load Date: Fri, 15 May 2026 11:28:28 +0200 Message-ID: <20260515092839.238064-12-a.bied-charreton@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260515092839.238064-1-a.bied-charreton@proxmox.com> References: <20260515092839.238064-1-a.bied-charreton@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.134 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: K47VNWPM5LAAXBVPNB773GEN2FXTMCXG X-Message-ID-Hash: K47VNWPM5LAAXBVPNB773GEN2FXTMCXG X-MailFrom: abied-charreton@jett.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: get_custom_model unconditionally loads the custom CPU models config. In order to allow avoiding a redundant load at a call site that already has the config loaded, take an optional $conf parameter and only load the config if that is undefined. Suggested-by: Thomas Lamprecht Signed-off-by: Arthur Bied-Charreton --- src/PVE/QemuServer/CPUConfig.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/QemuServer/CPUConfig.pm b/src/PVE/QemuServer/CPUConfig.pm index 06c00616..0de8c7e3 100644 --- a/src/PVE/QemuServer/CPUConfig.pm +++ b/src/PVE/QemuServer/CPUConfig.pm @@ -607,10 +607,10 @@ sub is_custom_model { # Use this to get a single model in the format described by $cpu_fmt. # Allows names with and without custom- prefix. sub get_custom_model { - my ($name, $noerr) = @_; + my ($name, $noerr, $conf) = @_; $name =~ s/^custom-//; - my $conf = load_custom_cpu_model_config(); + $conf //= load_custom_cpu_model_config(); my $entry = $conf->{ids}->{$name}; if (!defined($entry)) { -- 2.47.3