From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B7C3FB8A8E for ; Mon, 11 Mar 2024 11:13:17 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9588D66BD for ; Mon, 11 Mar 2024 11:13:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 11 Mar 2024 11:13:15 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 80444488DE for ; Mon, 11 Mar 2024 11:13:15 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Mon, 11 Mar 2024 11:13:08 +0100 Message-Id: <20240311101308.22243-1-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.095 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 qemu-server] cpu config: die on hotplug of non x86_64 CPUs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2024 10:13:17 -0000 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 --- 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