[PATCH qemu-server v2 1/2] cpu config: Add 'arch' property to cpu_fmt

[PATCH qemu-server v2 1/2] cpu config: Add 'arch' property to cpu_fmt

[Arthur Bied-Charreton]

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 <a.bied-charreton@proxmox.com>
---
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

 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..cf0e1023 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 => {
+        %$arch_desc,
+        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

[PATCH qemu-server v2 2/2] cpu config: Add tests for arch/reported-model misconfigurations

[Arthur Bied-Charreton]

Test that validate_cpu_conf denies custom CPU models with
a 'reported-model' that does not exist on the specified (or
default) 'arch'.

Test that get_cpu_options denies configurations with custom
CPU model arch not matching the VM arch.

Signed-off-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
---
 src/test/Makefile                             |  5 +-
 .../cfg2cmd/custom-cpu-model-wrong-arch.conf  |  9 +++
 src/test/run_config2command_tests.pl          |  4 ++
 src/test/run_cpu_config_tests.pl              | 57 +++++++++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 src/test/cfg2cmd/custom-cpu-model-wrong-arch.conf
 create mode 100755 src/test/run_cpu_config_tests.pl

diff --git a/src/test/Makefile b/src/test/Makefile
index 2ef9073a..dcfab6d6 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,6 +1,6 @@
 all: test
 
-test: test_snapshot test_cfg_to_cmd test_pci_addr_conflicts test_pci_reservation test_qemu_img_convert test_migration test_restore_config test_parse_config
+test: test_snapshot test_cfg_to_cmd test_pci_addr_conflicts test_pci_reservation test_qemu_img_convert test_migration test_restore_config test_parse_config test_cpu_config
 
 test_snapshot: run_snapshot_tests.pl
 	./run_snapshot_tests.pl
@@ -31,6 +31,9 @@ test_restore_config: run_qemu_restore_config_tests.pl
 test_parse_config: run_parse_config_tests.pl
 	./run_parse_config_tests.pl
 
+test_cpu_config: run_cpu_config_tests.pl
+	perl -I../ ./run_cpu_config_tests.pl
+
 .PHONY: clean
 clean:
 	rm -rf MigrationTest/run parse-config-output
diff --git a/src/test/cfg2cmd/custom-cpu-model-wrong-arch.conf b/src/test/cfg2cmd/custom-cpu-model-wrong-arch.conf
new file mode 100644
index 00000000..e2ed752f
--- /dev/null
+++ b/src/test/cfg2cmd/custom-cpu-model-wrong-arch.conf
@@ -0,0 +1,9 @@
+# TEST: custom CPU model with wrong arch for VM is rejected
+# EXPECT_ERROR: custom CPU model has arch 'aarch64', but VM has arch 'x86_64'
+cores: 2
+cpu: custom-aarch64cpu
+name: wrong-arch-cpu
+numa: 0
+ostype: l26
+smbios1: uuid=2ea3f676-dfa5-11e9-ae82-c721e12f3fcd
+sockets: 1
diff --git a/src/test/run_config2command_tests.pl b/src/test/run_config2command_tests.pl
index 4c872d1c..dec07bda 100755
--- a/src/test/run_config2command_tests.pl
+++ b/src/test/run_config2command_tests.pl
@@ -408,6 +408,10 @@ cpu-model: qemu64
 
 cpu-model: alldefault
 
+cpu-model: aarch64cpu
+    reported-model cortex-a76
+    arch aarch64
+
 EOF
         );
     },
diff --git a/src/test/run_cpu_config_tests.pl b/src/test/run_cpu_config_tests.pl
new file mode 100755
index 00000000..d3e587cc
--- /dev/null
+++ b/src/test/run_cpu_config_tests.pl
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use lib qw(..);
+
+use Test::More;
+
+use PVE::JSONSchema;
+use PVE::QemuServer::CPUConfig;
+
+# Test that validate_cpu_conf rejects a custom CPU model whose reported-model
+# doesn't match the specified arch.
+
+my @tests = (
+    {
+        name => 'x86_64 reported-model with aarch64 arch is rejected',
+        input => 'custom-mycpu,reported-model=qemu64,arch=aarch64',
+        expected_error => qr/reported model 'qemu64' is not valid for architecture 'aarch64'/,
+    },
+    {
+        name => 'aarch64 reported-model with x86_64 arch is rejected',
+        input => 'custom-mycpu,reported-model=cortex-a76,arch=x86_64',
+        expected_error =>
+            qr/reported model 'cortex-a76' is not valid for architecture 'x86_64'/,
+    },
+    {
+        name => 'aarch64 reported-model with default (x86_64) arch is rejected',
+        input => 'custom-mycpu,reported-model=cortex-a76',
+        expected_error =>
+            qr/reported model 'cortex-a76' is not valid for architecture 'x86_64'/,
+    },
+    {
+        name => 'x86_64 reported-model with matching arch is accepted',
+        input => 'custom-mycpu,reported-model=qemu64,arch=x86_64',
+        expected_error => undef,
+    },
+    {
+        name => 'aarch64 reported-model with matching arch is accepted',
+        input => 'custom-mycpu,reported-model=cortex-a76,arch=aarch64',
+        expected_error => undef,
+    },
+);
+
+for my $test (@tests) {
+    eval { PVE::JSONSchema::parse_property_string('pve-cpu-conf', $test->{input}); };
+    my $err = $@;
+
+    if ($test->{expected_error}) {
+        like($err, $test->{expected_error}, $test->{name});
+    } else {
+        is($err, '', $test->{name});
+    }
+}
+
+done_testing();
-- 
2.47.3

superseded: [PATCH qemu-server v2 1/2] cpu config: Add 'arch' property to cpu_fmt

[Arthur Bied-Charreton]

introduced a test failure when changing an error message before 
submitting this, apologies for the noise

Superseded-by: https://lore.proxmox.com/pve-devel/20260217141036.338747-1-a.bied-charreton@proxmox.com/T/#t