From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 58F0C1FF136 for ; Mon, 23 Mar 2026 14:29:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1AC14198EA; Mon, 23 Mar 2026 14:29:10 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 1/4] cpu config: split resolve_cpu_flags() function Date: Mon, 23 Mar 2026 14:27:21 +0100 Message-ID: <20260323132857.125747-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323132857.125747-1-f.ebner@proxmox.com> References: <20260323132857.125747-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774272494920 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 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 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. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: T5W5DCQLRDAUMDMJ6KVBPSN6BW43OXCD X-Message-ID-Hash: T5W5DCQLRDAUMDMJ6KVBPSN6BW43OXCD X-MailFrom: f.ebner@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: In preparation to re-use the resolved flags for a check. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/CPUConfig.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/PVE/QemuServer/CPUConfig.pm b/src/PVE/QemuServer/CPUConfig.pm index 1a4f2510..c689efad 100644 --- a/src/PVE/QemuServer/CPUConfig.pm +++ b/src/PVE/QemuServer/CPUConfig.pm @@ -778,7 +778,7 @@ sub is_abstracted { # }, # ... # } -sub resolve_cpu_flags { +my sub resolve_cpu_flags { my @flag_hashes = @_; my $flags = {}; @@ -836,6 +836,12 @@ sub resolve_cpu_flags { } } + return $flags; +} + +my sub print_cpu_flags { + my ($flags) = @_; + my $flag_str = ''; # sort for command line stability for my $flag_name (sort keys %$flags) { @@ -957,7 +963,7 @@ sub get_cpu_options { my $cpu_str = $cputype; # will be resolved in parameter order - $cpu_str .= resolve_cpu_flags( + my $resolved_flags = resolve_cpu_flags( $pve_flags, $hv_flags, $builtin_cputype_flags, @@ -965,6 +971,7 @@ sub get_cpu_options { $vm_flags, $pve_forced_flags, ); + $cpu_str .= print_cpu_flags($resolved_flags); for my $phys_bits_opt (qw(guest-phys-bits phys-bits)) { my $phys_bits = ''; -- 2.47.3