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 E1F131FF164 for ; Fri, 17 Jan 2025 15:24:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F1337104C6; Fri, 17 Jan 2025 15:24:39 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 17 Jan 2025 15:24:16 +0100 Message-Id: <20250117142430.99484-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250117142430.99484-1-f.ebner@proxmox.com> References: <20250117142430.99484-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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm, helpers.pm] Subject: [pve-devel] [PATCH qemu-server v4 02/16] move get_command_for_arch() helper to helpers 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" Cannot use the is_native_arch() helper inside the function anymore, to avoid a cyclic dependency between the 'CPUConfig' and 'Helpers' modules, inline it. While at it, improve the variable name for the mapping. Signed-off-by: Fiona Ebner --- Changes in v4: * add import for get_host_arch() * squash rename from following patch into this one PVE/QemuServer.pm | 19 +++---------------- PVE/QemuServer/Helpers.pm | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index bc38fb1b..ce962b7a 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -1199,7 +1199,7 @@ my $kvm_mtime = {}; sub kvm_user_version { my ($binary) = @_; - $binary //= get_command_for_arch(get_host_arch()); # get the native arch by default + $binary //= PVE::QemuServer::Helpers::get_command_for_arch(get_host_arch()); # get the native arch by default my $st = stat($binary); my $cachedmtime = $kvm_mtime->{$binary} // -1; @@ -3397,19 +3397,6 @@ sub get_ovmf_files($$$) { return ($ovmf_code, $ovmf_vars); } -my $Arch2Qemu = { - aarch64 => '/usr/bin/qemu-system-aarch64', - x86_64 => '/usr/bin/qemu-system-x86_64', -}; -sub get_command_for_arch($) { - my ($arch) = @_; - return '/usr/bin/kvm' if is_native_arch($arch); - - my $cmd = $Arch2Qemu->{$arch} - or die "don't know how to emulate architecture '$arch'\n"; - return $cmd; -} - # To use query_supported_cpu_flags and query_understood_cpu_flags to get flags # to use in a QEMU command line (-cpu element), first array_intersect the result # of query_supported_ with query_understood_. This is necessary because: @@ -3444,7 +3431,7 @@ sub query_supported_cpu_flags { $arch eq "aarch64"; my $kvm_supported = defined(kvm_version()); - my $qemu_cmd = get_command_for_arch($arch); + my $qemu_cmd = PVE::QemuServer::Helpers::get_command_for_arch($arch); my $fakevmid = -1; my $pidfile = PVE::QemuServer::Helpers::pidfile_name($fakevmid); @@ -3634,7 +3621,7 @@ sub config_to_command { my $machine_conf = PVE::QemuServer::Machine::parse_machine($conf->{machine}); my $arch = get_vm_arch($conf); - my $kvm_binary = get_command_for_arch($arch); + my $kvm_binary = PVE::QemuServer::Helpers::get_command_for_arch($arch); my $kvmver = kvm_user_version($kvm_binary); if (!$kvmver || $kvmver !~ m/^(\d+)\.(\d+)/ || $1 < 5) { diff --git a/PVE/QemuServer/Helpers.pm b/PVE/QemuServer/Helpers.pm index 72a46a0a..7b65ba44 100644 --- a/PVE/QemuServer/Helpers.pm +++ b/PVE/QemuServer/Helpers.pm @@ -8,6 +8,7 @@ use JSON; use PVE::INotify; use PVE::ProcFSTools; +use PVE::Tools qw(get_host_arch); use base 'Exporter'; our @EXPORT_OK = qw( @@ -19,6 +20,19 @@ windows_version my $nodename = PVE::INotify::nodename(); +my $arch_to_qemu_binary = { + aarch64 => '/usr/bin/qemu-system-aarch64', + x86_64 => '/usr/bin/qemu-system-x86_64', +}; +sub get_command_for_arch($) { + my ($arch) = @_; + return '/usr/bin/kvm' if get_host_arch() eq $arch; # i.e. native arch + + my $cmd = $arch_to_qemu_binary->{$arch} + or die "don't know how to emulate architecture '$arch'\n"; + return $cmd; +} + # Paths and directories our $var_run_tmpdir = "/var/run/qemu-server"; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel