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 C347FBBBAA for ; Tue, 19 Dec 2023 10:41:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A358535225 for ; Tue, 19 Dec 2023 10:40:30 +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 ; Tue, 19 Dec 2023 10:40:30 +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 56CA148560 for ; Tue, 19 Dec 2023 10:40:29 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Tue, 19 Dec 2023 10:40:23 +0100 Message-Id: <20231219094023.25726-6-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231219094023.25726-1-f.schauer@proxmox.com> References: <20231219094023.25726-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.143 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 qemu-server 4/4] cpu config: Unify the default value for 'kvm' 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: Tue, 19 Dec 2023 09:41:00 -0000 Make the default value for 'kvm' consistent and take into account whether the VM will run on the same CPU architecture as the host. This is a breaking change for VMs with a different CPU architecture running on an x86_64 host, since in this case the default CPU type for CPU hotplug switches from 'kvm64' to 'qemu64'. Signed-off-by: Filip Schauer --- PVE/QemuServer.pm | 6 ++++-- PVE/QemuServer/CPUConfig.pm | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 1a1080d..b2d71e1 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3815,7 +3815,7 @@ sub config_to_command { if ($hotplug_features->{cpu} && min_version($machine_version, 2, 7)) { push @$cmd, '-smp', "1,sockets=$sockets,cores=$cores,maxcpus=$maxcpus"; for (my $i = 2; $i <= $vcpus; $i++) { - my $cpustr = print_cpu_device($conf,$i); + my $cpustr = print_cpu_device($conf, $arch, $i); push @$cmd, '-device', $cpustr; } @@ -4656,10 +4656,12 @@ sub qemu_cpu_hotplug { die "vcpus in running vm does not match its configuration\n" if scalar(@{$currentrunningvcpus}) != $currentvcpus; + my $arch = get_vm_arch($conf); + if (PVE::QemuServer::Machine::machine_version($machine_type, 2, 7)) { for (my $i = $currentvcpus+1; $i <= $vcpus; $i++) { - my $cpustr = print_cpu_device($conf, $i); + my $cpustr = print_cpu_device($conf, $arch, $i); qemu_deviceadd($vmid, $cpustr); my $retry = 0; diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm index abf3198..38d80ca 100644 --- a/PVE/QemuServer/CPUConfig.pm +++ b/PVE/QemuServer/CPUConfig.pm @@ -5,6 +5,7 @@ use warnings; use PVE::JSONSchema; use PVE::Cluster qw(cfs_register_file cfs_read_file); +use PVE::Tools qw(is_native); use PVE::QemuServer::Helpers qw(get_default_cpu_type min_version); use base qw(PVE::SectionConfig Exporter); @@ -414,9 +415,9 @@ sub get_custom_model { # Print a QEMU device node for a given VM configuration for hotplugging CPUs sub print_cpu_device { - my ($conf, $id) = @_; + my ($conf, $arch, $id) = @_; - my $kvm = $conf->{kvm} // 1; + my $kvm = $conf->{kvm} // is_native($arch); my $cpu = get_default_cpu_type('x86_64', $kvm); if (my $cputype = $conf->{cpu}) { my $cpuconf = PVE::JSONSchema::parse_property_string('pve-vm-cpu-conf', $cputype) -- 2.39.2