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 77CF8B851 for ; Mon, 3 Jul 2023 09:35:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60933192FA for ; Mon, 3 Jul 2023 09:35:07 +0200 (CEST) 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 ; Mon, 3 Jul 2023 09:35:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 783F74368D for ; Mon, 3 Jul 2023 09:35:06 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 3 Jul 2023 09:35:00 +0200 Message-Id: <20230703073500.290868-4-c.heiss@proxmox.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230703073500.290868-1-c.heiss@proxmox.com> References: <20230703073500.290868-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.074 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 - Subject: [pve-devel] [PATCH installer 3/3] tui: check hvm support through runtime env info instead of open-coding 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: Mon, 03 Jul 2023 07:35:07 -0000 As the runtime environment now exports that info, use it. In turn, this allows us to drop the dependency on `proxmox-sys`, as that check was its only user. The dependency graph drops from 107 to 88 crates from this, which definitively is a nice change. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/Cargo.toml | 2 -- proxmox-tui-installer/src/main.rs | 25 ++++++++++--------------- proxmox-tui-installer/src/setup.rs | 4 ++++ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/proxmox-tui-installer/Cargo.toml b/proxmox-tui-installer/Cargo.toml index 5a50c69..8a6eba8 100644 --- a/proxmox-tui-installer/Cargo.toml +++ b/proxmox-tui-installer/Cargo.toml @@ -12,5 +12,3 @@ cursive = { version = "0.20.0", default-features = false, features = ["termion-b serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" regex = "1.7" - -proxmox-sys = "0.5.0" diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs index 64f21fa..109def3 100644 --- a/proxmox-tui-installer/src/main.rs +++ b/proxmox-tui-installer/src/main.rs @@ -25,13 +25,11 @@ use cursive::{ use regex::Regex; -use proxmox_sys::linux::procfs; - mod options; use options::*; mod setup; -use setup::{InstallConfig, LocaleInfo, RuntimeInfo, SetupInfo}; +use setup::{InstallConfig, LocaleInfo, ProxmoxProduct, RuntimeInfo, SetupInfo}; mod system; @@ -255,7 +253,7 @@ fn installer_setup(in_test_mode: bool) -> Result<(LocaleInfo, RuntimeInfo), Stri /// Anything that can be done late in the setup and will not result in fatal errors. fn installer_setup_late(siv: &mut Cursive) { - let state = siv.user_data::().unwrap(); + let state = siv.user_data::().cloned().unwrap(); if !state.in_test_mode { let kmap_id = &state.options.timezone.kb_layout; @@ -266,17 +264,14 @@ fn installer_setup_late(siv: &mut Cursive) { } } - if setup_info().config.product == setup::ProxmoxProduct::PVE { - let cpu_hvm = procfs::read_cpuinfo().map(|info| info.hvm).unwrap_or(false); - if !cpu_hvm { - display_setup_warning( - siv, - concat!( - "No support for hardware-accelerated KVM virtualization detected.\n\n", - "Check BIOS settings for Intel VT / AMD-V / SVM." - ), - ); - } + if state.setup_info.config.product == ProxmoxProduct::PVE && !state.runtime_info.hvm_supported { + display_setup_warning( + siv, + concat!( + "No support for hardware-accelerated KVM virtualization detected.\n\n", + "Check BIOS settings for Intel VT / AMD-V / SVM." + ), + ); } } diff --git a/proxmox-tui-installer/src/setup.rs b/proxmox-tui-installer/src/setup.rs index 68207c8..9d14cf8 100644 --- a/proxmox-tui-installer/src/setup.rs +++ b/proxmox-tui-installer/src/setup.rs @@ -367,6 +367,10 @@ pub struct RuntimeInfo { /// Total memory of the system in MiB. pub total_memory: usize, + + /// Whether the CPU supports hardware-accelerated virtualization + #[serde(deserialize_with = "deserialize_bool_from_int")] + pub hvm_supported: bool, } #[derive(Clone, Deserialize)] -- 2.40.1