From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id F24961FF164 for ; Fri, 3 Jan 2025 16:58:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6DF5828E56; Fri, 3 Jan 2025 16:58:16 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 3 Jan 2025 16:57:59 +0100 Message-Id: <20250103155802.143669-17-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250103155802.143669-1-f.ebner@proxmox.com> References: <20250103155802.143669-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.051 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 Subject: [pve-devel] [PATCH qemu-server 16/19] machine: rename machine_version() function to machine_version_at_least() 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The old name does not make it clear what exactly the function does. Signed-off-by: Fiona Ebner --- PVE/QemuServer.pm | 4 ++-- PVE/QemuServer/Machine.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 12e5543d..5e577431 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4521,7 +4521,7 @@ sub qemu_cpu_hotplug { if ($vcpus < $currentvcpus) { - if (PVE::QemuServer::Machine::machine_version($machine_type, 2, 7)) { + if (PVE::QemuServer::Machine::machine_version_at_least($machine_type, 2, 7)) { for (my $i = $currentvcpus; $i > $vcpus; $i--) { qemu_devicedel($vmid, "cpu$i"); @@ -4549,7 +4549,7 @@ sub qemu_cpu_hotplug { die "vcpus in running vm does not match its configuration\n" if scalar(@{$currentrunningvcpus}) != $currentvcpus; - if (PVE::QemuServer::Machine::machine_version($machine_type, 2, 7)) { + if (PVE::QemuServer::Machine::machine_version_at_least($machine_type, 2, 7)) { my $arch = PVE::QemuServer::Helpers::get_vm_arch($conf); for (my $i = $currentvcpus+1; $i <= $vcpus; $i++) { diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index 9b18cf6e..6398e756 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -136,7 +136,7 @@ sub extract_version { return; } -sub machine_version { +sub machine_version_at_least { my ($machine_type, $major, $minor, $pve) = @_; return PVE::QemuServer::Helpers::min_version( -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel