public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Erik Fastermann <e.fastermann@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Erik Fastermann <e.fastermann@proxmox.com>
Subject: [PATCH qemu-server] remote migration: validate custom CPU configs
Date: Thu, 18 Jun 2026 10:08:11 +0200	[thread overview]
Message-ID: <20260618080811.20382-1-e.fastermann@proxmox.com> (raw)

Previously, a remote migration would fail with a cryptic error message
if a custom CPU model was selected that did not exist on the target
server. Furthermore, no validation was performed to ensure that the
custom CPU definitions matched between the source and target.

Fix this by comparing the CPU configurations before initiating the
migration and aborting early if they do not match.

Reported-by: Walter Hoos <w.hoos@proxmox.com>
Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Erik Fastermann <e.fastermann@proxmox.com>
---
 src/PVE/API2/Qemu.pm | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
index 54883f1e..3f1362c6 100644
--- a/src/PVE/API2/Qemu.pm
+++ b/src/PVE/API2/Qemu.pm
@@ -5745,6 +5745,54 @@ __PACKAGE__->register_method({
             $param->{online} = 0;
         }
 
+        if (defined($conf->{cpu})) {
+            my $cpu = PVE::JSONSchema::parse_property_string('pve-vm-cpu-conf', $conf->{cpu});
+            my $cputype = $cpu->{cputype};
+            if (defined($cputype) && PVE::QemuServer::CPUConfig::is_custom_model($cputype)) {
+                my $custom_cpu = PVE::QemuServer::CPUConfig::get_custom_model($cputype);
+
+                my $remote_custom_cpu = eval {
+                    $api_client->get("/cluster/qemu/custom-cpu-models/"
+                        . URI::Escape::uri_escape_utf8($cputype));
+                };
+                if (my $err = $@) {
+                    die "cpu $cputype config mismatch: $err\n";
+                }
+
+                my $cpu_fmt = PVE::QemuServer::CPUConfig->options();
+                eval { PVE::JSONSchema::validate($remote_custom_cpu, $cpu_fmt); };
+                if (my $err = $@) {
+                    die "cpu $cputype config mismatch: $err\n";
+                }
+
+                my @custom_cpu_flags = sort split /;/, ($custom_cpu->{flags} // '');
+                my @remote_custom_cpu_flags = sort split /;/,
+                    ($remote_custom_cpu->{flags} // '');
+
+                my $cpu_flags_mismatch_error =
+                    "cpu $cputype config mismatch for flags: local="
+                    . $custom_cpu->{flags}
+                    . ",remote="
+                    . $remote_custom_cpu->{flags} . "\n";
+
+                die $cpu_flags_mismatch_error
+                    if @custom_cpu_flags != @remote_custom_cpu_flags;
+
+                for my $i (0 .. $#custom_cpu_flags) {
+                    die $cpu_flags_mismatch_error
+                        if $custom_cpu_flags[$i] ne $remote_custom_cpu_flags[$i];
+                }
+
+                for my $key (sort keys %$cpu_fmt) {
+                    next if $key eq 'flags';
+                    my $v1 = $custom_cpu->{$key} // '';
+                    my $v2 = $remote_custom_cpu->{$key} // '';
+                    die "cpu $cputype config mismatch for $key: local=$v1,remote=$v2\n"
+                        if $v1 ne $v2;
+                }
+            }
+        }
+
         my $storecfg = PVE::Storage::config();
         my $target_storage = extract_param($param, 'target-storage');
         my $storagemap =
-- 
2.47.3




                 reply	other threads:[~2026-06-18  8:08 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260618080811.20382-1-e.fastermann@proxmox.com \
    --to=e.fastermann@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal