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 679EA1FF14C for ; Fri, 15 May 2026 11:30:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A518914B90; Fri, 15 May 2026 11:29:15 +0200 (CEST) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v5 07/21] cpu config: rename custom CPU model config loader Date: Fri, 15 May 2026 11:28:24 +0200 Message-ID: <20260515092839.238064-8-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.135 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: MOIAYTEWQKWHTUAVI7W2Y5YGSVXQO3KD X-Message-ID-Hash: MOIAYTEWQKWHTUAVI7W2Y5YGSVXQO3KD 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: ... from load_custom_model_conf to the more explicit load_custom_cpu_model_config. Signed-off-by: Arthur Bied-Charreton --- src/PVE/QemuServer/CPUConfig.pm | 6 +++--- src/test/run_config2command_tests.pl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PVE/QemuServer/CPUConfig.pm b/src/PVE/QemuServer/CPUConfig.pm index 0ee9b991..3f963218 100644 --- a/src/PVE/QemuServer/CPUConfig.pm +++ b/src/PVE/QemuServer/CPUConfig.pm @@ -46,7 +46,7 @@ cfs_register_file( sub { PVE::QemuServer::CPUConfig->write_config(@_); }, ); -sub load_custom_model_conf { +sub load_custom_cpu_model_config { return cfs_read_file($cpu_models_filename); } @@ -571,7 +571,7 @@ sub get_cpu_models { return $models if !$include_custom; - my $conf = load_custom_model_conf(); + my $conf = load_custom_cpu_model_config(); for my $custom_model (keys %{ $conf->{ids} }) { my $reported_model = $conf->{ids}->{$custom_model}->{'reported-model'}; $reported_model //= $cpu_fmt->{'reported-model'}->{default}; @@ -598,7 +598,7 @@ sub get_custom_model { my ($name, $noerr) = @_; $name =~ s/^custom-//; - my $conf = load_custom_model_conf(); + my $conf = load_custom_cpu_model_config(); my $entry = $conf->{ids}->{$name}; if (!defined($entry)) { diff --git a/src/test/run_config2command_tests.pl b/src/test/run_config2command_tests.pl index ebe0dca1..0341d2f9 100755 --- a/src/test/run_config2command_tests.pl +++ b/src/test/run_config2command_tests.pl @@ -435,7 +435,7 @@ $pve_common_file->mock( my $pve_cpuconfig; $pve_cpuconfig = Test::MockModule->new('PVE::QemuServer::CPUConfig'); $pve_cpuconfig->mock( - load_custom_model_conf => sub { + load_custom_cpu_model_config => sub { # mock custom CPU model config return PVE::QemuServer::CPUConfig->parse_config( "cpu-models.conf", -- 2.47.3