From bf44b402f8a2da4ed2d0b93fa8d6fe8068ab6dd4 Mon Sep 17 00:00:00 2001 From: Ing Date: Wed, 1 Jan 2025 17:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20checkCPU=5FVT=5Fd=20?= =?UTF-8?q?=E5=92=8C=20checkBIOS=5FVT=5Fd=20=E5=87=BD=E6=95=B0=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E8=BE=93=E5=87=BA=E9=87=8D=E5=AE=9A?= =?UTF-8?q?=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/initrd/opt/rr/include/functions.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/files/initrd/opt/rr/include/functions.sh b/files/initrd/opt/rr/include/functions.sh index 2489ceb2..23d65a6a 100755 --- a/files/initrd/opt/rr/include/functions.sh +++ b/files/initrd/opt/rr/include/functions.sh @@ -369,10 +369,10 @@ function delCmdline() { # check CPU Intel(VT-d)/AMD(AMD-Vi) function checkCPU_VT_d() { lsmod | grep -q msr || modprobe msr 2>/dev/null - if grep -q "GenuineIntel" /proc/cpuinfo; then + if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then local VT_D_ENABLED=$(rdmsr 0x3a 2>/dev/null) [ "$((${VT_D_ENABLED:-0x0} & 0x5))" -eq $((0x5)) ] && return 0 - elif grep -q "AuthenticAMD" /proc/cpuinfo; then + elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then local IOMMU_ENABLED=$(rdmsr 0xC0010114 2>/dev/null) [ "$((${IOMMU_ENABLED:-0x0} & 0x1))" -eq $((0x1)) ] && return 0 else @@ -383,11 +383,11 @@ function checkCPU_VT_d() { ############################################################################### # check BIOS Intel(VT-d)/AMD(AMD-Vi) function checkBIOS_VT_d() { - if grep -q "GenuineIntel" /proc/cpuinfo; then - dmesg | grep -iq "DMAR-IR.*DRHD base" && return 0 - elif grep -q "AuthenticAMD" /proc/cpuinfo; then + if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then + dmesg 2>/dev/null | grep -iq "DMAR-IR.*DRHD base" && return 0 + elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then # TODO: need check - dmesg | grep -iq "AMD-Vi.*enabled" && return 0 + dmesg 2>/dev/null | grep -iq "AMD-Vi.*enabled" && return 0 else return 1 fi