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 042B71FF164 for ; Fri, 3 Jan 2025 17:00:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 497F42931F; Fri, 3 Jan 2025 16:58:44 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 3 Jan 2025 16:57:52 +0100 Message-Id: <20250103155802.143669-10-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 09/19] move windows_get_pinned_machine_version() function 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/API2/Qemu.pm | 3 ++- PVE/QemuServer.pm | 24 +----------------------- PVE/QemuServer/Machine.pm | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 4c8b2bc0..528fc261 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1245,7 +1245,8 @@ __PACKAGE__->register_method({ if (!$machine || $machine =~ m/^(?:pc|q35|virt)$/) { # always pin Windows' machine version on create, they get to easily confused if (PVE::QemuServer::Helpers::windows_version($conf->{ostype})) { - $machine_conf->{type} = PVE::QemuServer::windows_get_pinned_machine_version($machine); + $machine_conf->{type} = + PVE::QemuServer::Machine::windows_get_pinned_machine_version($machine); $conf->{machine} = PVE::QemuServer::Machine::print_machine($machine_conf); } } diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 5b1ad3bc..6ae524b2 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3260,28 +3260,6 @@ sub vga_conf_has_spice { return $1 || 1; } -sub windows_get_pinned_machine_version { - my ($machine, $base_version, $kvmversion) = @_; - - my $pin_version = $base_version; - if (!defined($base_version) || - !PVE::QemuServer::Machine::can_run_pve_machine_version($base_version, $kvmversion) - ) { - $pin_version = PVE::QemuServer::Machine::get_installed_machine_version($kvmversion); - } - if (!$machine || $machine eq 'pc') { - $machine = "pc-i440fx-$pin_version"; - } elsif ($machine eq 'q35') { - $machine = "pc-q35-$pin_version"; - } elsif ($machine eq 'virt') { - $machine = "virt-$pin_version"; - } else { - warn "unknown machine type '$machine', not touching that!\n"; - } - - return $machine; -} - sub get_vm_machine { my ($conf, $forcemachine, $arch) = @_; @@ -3294,7 +3272,7 @@ sub get_vm_machine { # layout which confuses windows quite a bit and may result in various regressions.. # see: https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg08484.html if (windows_version($conf->{ostype})) { - $machine = windows_get_pinned_machine_version($machine, '5.1', $kvmversion); + $machine = PVE::QemuServer::Machine::windows_get_pinned_machine_version($machine, '5.1', $kvmversion); } $arch //= 'x86_64'; $machine ||= PVE::QemuServer::Machine::default_machine_for_arch($arch); diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index 075554f4..04c77ed5 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -193,4 +193,24 @@ sub get_installed_machine_version { return $1; } +sub windows_get_pinned_machine_version { + my ($machine, $base_version, $kvmversion) = @_; + + my $pin_version = $base_version; + if (!defined($base_version) || !can_run_pve_machine_version($base_version, $kvmversion)) { + $pin_version = get_installed_machine_version($kvmversion); + } + if (!$machine || $machine eq 'pc') { + $machine = "pc-i440fx-$pin_version"; + } elsif ($machine eq 'q35') { + $machine = "pc-q35-$pin_version"; + } elsif ($machine eq 'virt') { + $machine = "virt-$pin_version"; + } else { + warn "unknown machine type '$machine', not touching that!\n"; + } + + return $machine; +} + 1; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel