From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <c.heiss@proxmox.com>
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 CDB56B968
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 09:35:37 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B228F192FB
for <pve-devel@lists.proxmox.com>; 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 <pve-devel@lists.proxmox.com>; 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 2F4944369D
for <pve-devel@lists.proxmox.com>; Mon, 3 Jul 2023 09:35:06 +0200 (CEST)
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 3 Jul 2023 09:34:59 +0200
Message-Id: <20230703073500.290868-3-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.076 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 2/3] proxinstall: check hvm support
through runtime env info
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2023 07:35:37 -0000
As that info is now available through the runtime environment info, use
it and avoid duplicating logic.
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
proxinstall | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/proxinstall b/proxinstall
index 274f39c..d5b2565 100755
--- a/proxinstall
+++ b/proxinstall
@@ -1583,14 +1583,11 @@ sub create_intro_view {
"See 'System Requirements' in the $iso_env->{cfg}->{fullname} documentation.");
}
- if ($iso_env->{product} eq 'pve') {
- my $cpuinfo = eval { file_read_all('/proc/cpuinfo') };
- if (!$cpuinfo || $cpuinfo !~ /^flags\s*:.*(vmx|svm)/m) {
- Proxmox::UI::error(
- "No support for hardware-accelerated KVM virtualization detected.\n\n"
- ."Check BIOS settings for Intel VT / AMD-V / SVM."
- );
- }
+ if ($iso_env->{product} eq 'pve' && !$run_env->{hvm_supported}) {
+ Proxmox::UI::error(
+ "No support for hardware-accelerated KVM virtualization detected.\n\n"
+ ."Check BIOS settings for Intel VT / AMD-V / SVM."
+ );
}
Proxmox::UI::display_html('license.htm', sub {
--
2.40.1