From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 172649426A for ; Wed, 21 Feb 2024 15:35:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EC9CA19EE5 for ; Wed, 21 Feb 2024 15:35:13 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 21 Feb 2024 15:35:13 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 01AD34451B for ; Wed, 21 Feb 2024 15:35:13 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Wed, 21 Feb 2024 15:33:15 +0100 Message-Id: <20240221143317.134090-5-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240221143317.134090-1-f.schauer@proxmox.com> References: <20240221143317.134090-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.111 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 T_SCC_BODY_TEXT_LINE -0.01 - 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] Subject: [pve-devel] [PATCH qemu-server 3/5] Move is_native from PVE::QemuServer to PVE::Tools 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: , X-List-Received-Date: Wed, 21 Feb 2024 14:35:44 -0000 Move is_native from PVE::QemuServer to PVE::Tools and rename it to is_native_arch to be more descriptive. Signed-off-by: Filip Schauer --- PVE/QemuServer.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 33c374c..7600939 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -45,7 +45,7 @@ use PVE::RPCEnvironment; use PVE::Storage; use PVE::SysFSTools; use PVE::Systemd; -use PVE::Tools qw(run_command file_read_firstline file_get_contents dir_glob_foreach get_host_arch $IPV6RE); +use PVE::Tools qw(run_command file_read_firstline file_get_contents dir_glob_foreach get_host_arch is_native_arch $IPV6RE); use PVE::QMPClient; use PVE::QemuConfig; @@ -1752,7 +1752,7 @@ sub print_netdev_full { if length($ifname) >= 16; my $vhostparam = ''; - if (is_native($arch)) { + if (is_native_arch($arch)) { $vhostparam = ',vhost=on' if kernel_has_vhost_net() && $net->{model} eq 'virtio'; } @@ -3215,11 +3215,6 @@ sub vga_conf_has_spice { return $1 || 1; } -sub is_native($) { - my ($arch) = @_; - return get_host_arch() eq $arch; -} - sub get_vm_arch { my ($conf) = @_; return $conf->{arch} // get_host_arch(); @@ -3323,7 +3318,7 @@ my $Arch2Qemu = { }; sub get_command_for_arch($) { my ($arch) = @_; - return '/usr/bin/kvm' if is_native($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"; @@ -3524,7 +3519,7 @@ sub config_to_command { my $machine_type = get_vm_machine($conf, $forcemachine, $arch, $add_pve_version); my $machine_version = extract_version($machine_type, $kvmver); - $kvm //= 1 if is_native($arch); + $kvm //= 1 if is_native_arch($arch); $machine_version =~ m/(\d+)\.(\d+)/; my ($machine_major, $machine_minor) = ($1, $2); -- 2.39.2