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 5F0321FF164 for ; Fri, 3 Jan 2025 16:58:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 482C228D6B; Fri, 3 Jan 2025 16:58:13 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 3 Jan 2025 16:57:50 +0100 Message-Id: <20250103155802.143669-8-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 07/19] machine: add default_machine_for_arch() 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" There are already other places where 'aarch64' and 'x86_64' are checked to be the only valid architectures, for example, the get_command_for_arch() helper, so the new error scenario for an unknown arch should not cause any regressions. Signed-off-by: Fiona Ebner --- PVE/QemuServer.pm | 9 ++------- PVE/QemuServer/Machine.pm | 12 ++++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 32b2a835..85bbb38f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3260,11 +3260,6 @@ sub vga_conf_has_spice { return $1 || 1; } -my $default_machines = { - x86_64 => 'pc', - aarch64 => 'virt', -}; - sub get_installed_machine_version { my ($kvmversion) = @_; $kvmversion = kvm_user_version() if !defined($kvmversion); @@ -3309,7 +3304,7 @@ sub get_vm_machine { $machine = windows_get_pinned_machine_version($machine, '5.1', $kvmversion); } $arch //= 'x86_64'; - $machine ||= $default_machines->{$arch}; + $machine ||= PVE::QemuServer::Machine::default_machine_for_arch($arch); my $pvever = PVE::QemuServer::Machine::get_pve_version($kvmversion); $machine .= "+pve$pvever"; } @@ -3375,7 +3370,7 @@ sub query_supported_cpu_flags { my ($arch) = @_; $arch //= get_host_arch(); - my $default_machine = $default_machines->{$arch}; + my $default_machine = PVE::QemuServer::Machine::default_machine_for_arch($arch); my $flags = {}; diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index 7f03ef20..5a039244 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -55,6 +55,18 @@ sub print_machine { return print_property_string($machine_conf, $machine_fmt); } +my $default_machines = { + x86_64 => 'pc', + aarch64 => 'virt', +}; + +sub default_machine_for_arch { + my ($arch) = @_; + + my $machine = $default_machines->{$arch} or die "unsupported architecture '$arch'\n"; + return $machine; +} + sub assert_valid_machine_property { my ($machine_conf) = @_; my $q35 = $machine_conf->{type} && ($machine_conf->{type} =~ m/q35/) ? 1 : 0; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel