[pve-devel] [PATCH v2 qemu-server] cpu config: die on hotplug of non x86_64 CPUs

[pve-devel] [PATCH v2 qemu-server] cpu config: die on hotplug of non x86_64 CPUs

[Filip Schauer]

When attempting a CPU hotplug on an architecture other than x86_64, die
with a clean error instead of attempting a hotplug with a known
non-working device command line. Also move the corresponding FIXME up to
the error.

Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
 PVE/QemuServer/CPUConfig.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm
index 7e57488..97a5e55 100644
--- a/PVE/QemuServer/CPUConfig.pm
+++ b/PVE/QemuServer/CPUConfig.pm
@@ -418,6 +418,9 @@ sub get_custom_model {
 sub print_cpu_device {
     my ($conf, $arch, $id) = @_;
 
+    # FIXME: hot plugging other architectures like our unofficial aarch64 support?
+    die "Hotplug of non x86_64 CPU not yet supported" if $arch ne 'x86_64';
+
     my $kvm = $conf->{kvm} // is_native_arch($arch);
     my $cpu = get_default_cpu_type('x86_64', $kvm);
     if (my $cputype = $conf->{cpu}) {
@@ -442,7 +445,6 @@ sub print_cpu_device {
     my $current_core = ($id - 1) % $cores;
     my $current_socket = int(($id - 1 - $current_core)/$cores);
 
-    # FIXME: hot plugging other architectures like our unofficial arch64 support?
     return "$cpu-x86_64-cpu,id=cpu$id,socket-id=$current_socket,core-id=$current_core,thread-id=0";
 }
 
-- 
2.39.2

[pve-devel] applied: [PATCH v2 qemu-server] cpu config: die on hotplug of non x86_64 CPUs

[Thomas Lamprecht]

Am 11/03/2024 um 11:13 schrieb Filip Schauer:
> When attempting a CPU hotplug on an architecture other than x86_64, die
> with a clean error instead of attempting a hotplug with a known
> non-working device command line. Also move the corresponding FIXME up to
> the error.
> 
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
> ---
>  PVE/QemuServer/CPUConfig.pm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
>

applied, thanks!