qubes-installer-qubes-os/anaconda/0038-anaconda-check-also-for-message-about-AMD-interrupt-.patch

36 lines
1.3 KiB
Diff
Raw Normal View History

2018-10-19 06:14:46 +00:00
From 9d9ba78cef13cbfb00af08fddfa122488763a8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Fri, 19 Oct 2018 08:02:12 +0200
Subject: [PATCH] anaconda: check also for message about AMD interrupt
remapping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes QubesOS/qubes-issues#3208
Signed-off-by: Frédéric Pierret <frederic.epitre@orange.fr>
---
pyanaconda/iutil.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py
index e3fb28862..166626a67 100644
--- a/pyanaconda/iutil.py
+++ b/pyanaconda/iutil.py
@@ -1113,7 +1113,9 @@ def is_unsupported_hw():
missing_features.append('IOMMU/VT-d/AMD-Vi')
if b'HVM: Hardware Assisted Paging (HAP) detected' not in xl_dmesg:
missing_features.append('HAP/SLAT/EPT/RVI')
- if b'Intel VT-d Interrupt Remapping enabled' not in xl_dmesg:
+ # slightly different wording for Intel and AMD
+ if b'Intel VT-d Interrupt Remapping enabled' not in xl_dmesg \
+ and 'Interrupt remapping enabled' not in xl_dmesg:
missing_features.append('Interrupt Remapping')
status = ', '.join(missing_features)
--
2.14.4