From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 2E2C01FF16F for ; Thu, 16 Jan 2025 12:51:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5EFF71ECA6; Thu, 16 Jan 2025 12:51:07 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 16 Jan 2025 12:50:44 +0100 Message-Id: <20250116115054.124447-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250116115054.124447-1-f.ebner@proxmox.com> References: <20250116115054.124447-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.050 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 v2 08/18] move get_installed_machine_version() helper to machine module 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" Signed-off-by: Fiona Ebner --- PVE/QemuServer.pm | 9 +-------- PVE/QemuServer/Machine.pm | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 82795767..ee7bb017 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3271,13 +3271,6 @@ sub vga_conf_has_spice { return $1 || 1; } -sub get_installed_machine_version { - my ($kvmversion) = @_; - $kvmversion = kvm_user_version() if !defined($kvmversion); - $kvmversion =~ m/^(\d+\.\d+)/; - return $1; -} - sub windows_get_pinned_machine_version { my ($machine, $base_version, $kvmversion) = @_; @@ -3285,7 +3278,7 @@ sub windows_get_pinned_machine_version { if (!defined($base_version) || !PVE::QemuServer::Machine::can_run_pve_machine_version($base_version, $kvmversion) ) { - $pin_version = get_installed_machine_version($kvmversion); + $pin_version = PVE::QemuServer::Machine::get_installed_machine_version($kvmversion); } if (!$machine || $machine eq 'pc') { $machine = "pc-i440fx-$pin_version"; diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index 5a039244..075554f4 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -186,4 +186,11 @@ sub qemu_machine_pxe { return $machine; } +sub get_installed_machine_version { + my ($kvmversion) = @_; + $kvmversion = PVE::QemuServer::Helpers::kvm_user_version() if !defined($kvmversion); + $kvmversion =~ m/^(\d+\.\d+)/; + return $1; +} + 1; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel