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 B92911FF137 for ; Tue, 17 Feb 2026 15:10:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2FD8592C; Tue, 17 Feb 2026 15:11:11 +0100 (CET) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v3 1/2] cpu config: Add 'arch' property to cpu_fmt Date: Tue, 17 Feb 2026 15:06:51 +0100 Message-ID: <20260217141036.338747-1-a.bied-charreton@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.093 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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: NXUPXRKVATMP2237ANHEJQW7QWXG7JWF X-Message-ID-Hash: NXUPXRKVATMP2237ANHEJQW7QWXG7JWF 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: Preparatory step for adding support for configuring custom CPU types in the PVE UI. Add optional property 'arch' (x86_64|aarch64) to cpu_fmt to allow custom models to indicate which architecture they belong to, default to x86_64 for backwards compatibility. Add checks to get_cpu_options and validate_cpu_conf to deny illegal configs early. Signed-off-by: Arthur Bied-Charreton --- Changes since v1: * add checks to validate_cpu_conf + get_cpu_options to fail early on misconfigurations * reuse the pve-qm-cpu-arch standard option for cpu_fmt's arch property * do not use single quotes for hash keys if not needed * do not use parentheses for post-ifs Changes since v2: * use get_standard_option for getting the pve-qm-cpu-arch standard option instead of accessing the arch_desc directly src/PVE/QemuServer/CPUConfig.pm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/PVE/QemuServer/CPUConfig.pm b/src/PVE/QemuServer/CPUConfig.pm index 32ec4954..a8e146d7 100644 --- a/src/PVE/QemuServer/CPUConfig.pm +++ b/src/PVE/QemuServer/CPUConfig.pm @@ -374,6 +374,12 @@ my $cpu_fmt = { . " note that doing so will break live migration to CPUs with other values.", optional => 1, }, + arch => { + %{ PVE::JSONSchema::get_standard_option('pve-qm-cpu-arch') }, + default => 'x86_64', + description => 'The architecture the CPU model belongs to.', + optional => 1, + }, }; my $sev_fmt = { @@ -475,6 +481,13 @@ sub validate_cpu_conf { my ($cpu) = @_; # required, but can't be forced in schema since it's encoded in section header for custom models die "CPU is missing cputype\n" if !$cpu->{cputype}; + + if (my $reported_model = $cpu->{'reported-model'}) { + my $arch = $cpu->{arch} // $cpu_fmt->{arch}->{default}; + die "reported model '$reported_model' is not valid for architecture '$arch'\n" + if !$cpu_models_by_arch->{$arch}->{$reported_model}; + } + return $cpu; } PVE::JSONSchema::register_format('pve-vm-cpu-conf', $cpu_fmt, \&validate_vm_cpu_conf); @@ -612,6 +625,10 @@ sub get_cpu_models { my $conf = load_custom_model_conf(); for my $custom_model (keys %{ $conf->{ids} }) { + my $custom_model_arch = $conf->{ids}->{$custom_model}->{arch}; + $custom_model_arch //= $cpu_fmt->{arch}->{default}; + next if $custom_model_arch ne $arch; + my $reported_model = $conf->{ids}->{$custom_model}->{'reported-model'}; $reported_model //= $cpu_fmt->{'reported-model'}->{default}; my $vendor = $all_cpu_models->{$reported_model}; @@ -854,6 +871,9 @@ sub get_cpu_options { $builtin_cpu->{flags} = $model->{'flags'}; } elsif (is_custom_model($cputype)) { $custom_cpu = get_custom_model($cputype); + my $custom_cpu_arch = $custom_cpu->{arch} // $cpu_fmt->{arch}->{default}; + die "custom CPU model has architecture '$custom_cpu_arch', but VM has '$arch'\n" + if $custom_cpu_arch ne $arch; $cputype = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default}; $kvm_off = $custom_cpu->{hidden} if defined($custom_cpu->{hidden}); -- 2.47.3