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

[Thomas Lamprecht]

Am 21/02/2024 um 15:33 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 at 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 7d471f4..01e4515 100644
> --- a/PVE/QemuServer/CPUConfig.pm
> +++ b/PVE/QemuServer/CPUConfig.pm
> @@ -417,6 +417,9 @@ sub get_custom_model {
>  sub print_cpu_device {
>      my ($conf, $arch, $id) = @_;
>  
> +    # FIXME: hot plugging other architectures like our unofficial arch64 support?
> +    die "Hotplug of non x86_64 CPU not yet supported" if $arch != 'x86_64';

arbitrary strings need to be compared using `eq` and `ne`, as `==` and `!=` can
only be used for numerics or strings that can be interpreted to one, so this never
could work.

Interestingly the if never triggers in the `!=` case but always triggers in the
`==` case.

Anyhow please fix this and actually test it.

> +
>      my $kvm = $conf->{kvm} // is_native_arch($arch);
>      my $cpu = get_default_cpu_type('x86_64', $kvm);
>      if (my $cputype = $conf->{cpu}) {
> @@ -441,7 +444,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";
>  }
>