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 D623F1FF164 for ; Fri, 3 Jan 2025 16:58:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B56F028E14; Fri, 3 Jan 2025 16:58:15 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 3 Jan 2025 16:57:56 +0100 Message-Id: <20250103155802.143669-14-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 13/19] machine: add check_and_pin_machine_string() helper 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" Extract the logic for guest OS-type dependent machine version pinning into a dedicated helper, so it can be re-used. Signed-off-by: Fiona Ebner --- PVE/API2/Qemu.pm | 14 +++----------- PVE/QemuServer/Machine.pm | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 7eba3a33..27711ee6 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1241,17 +1241,9 @@ __PACKAGE__->register_method({ $conf->{vmgenid} = PVE::QemuServer::generate_uuid(); } - my $machine_conf = PVE::QemuServer::Machine::parse_machine($conf->{machine}); - my $machine = $machine_conf->{type}; - 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::Machine::windows_get_pinned_machine_version($machine); - $conf->{machine} = PVE::QemuServer::Machine::print_machine($machine_conf); - } - } - PVE::QemuServer::Machine::assert_valid_machine_property($machine_conf); + # always pin Windows' machine version on create, they get confused too easily + $conf->{machine} = PVE::QemuServer::Machine::check_and_pin_machine_string( + $conf->{machine}, $conf->{ostype}); $conf->{lock} = 'import' if $live_import_mapping; diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index 679d69c7..cf00da6d 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -260,4 +260,20 @@ sub get_vm_machine { return $machine; } +sub check_and_pin_machine_string { + my ($machine_string, $ostype) = @_; + + my $machine_conf = parse_machine($machine_string); + my $machine = $machine_conf->{type}; + if (!$machine || $machine =~ m/^(?:pc|q35|virt)$/) { + # always pin Windows' machine version on create, they get confused too easily + if (PVE::QemuServer::Helpers::windows_version($ostype)) { + $machine_conf->{type} = windows_get_pinned_machine_version($machine); + } + } + + assert_valid_machine_property($machine_conf); + return print_machine($machine_conf); +} + 1; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel