Skip to content

Commit 7821217

Browse files
author
olevole
committed
optional auto-load for nvmm module
1 parent c8826f7 commit 7821217

File tree

1 file changed

+32
-2
lines changed

1 file changed

+32
-2
lines changed

subr/qemu.subr

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,8 +1109,38 @@ compile_machine_args()
11091109
${NVMMCTL_CMD} identify
11101110
_ret=$?
11111111
if [ ${_ret} -ne 0 ]; then
1112-
${ECHO} "${W1_COLOR}Warning${N1_COLOR}: identify failed: ${N2_COLOR}${NVMMCTL_CMD} identify${N1_COLOR}. Acceleration disabled. It will work slowly${N0_COLOR}"
1113-
_accel=0
1112+
readconf nvmm.conf
1113+
if [ "${nvmm_module_auto_load}" = "1" ]; then
1114+
${ECHO} "${W1_COLOR}Warning${N1_COLOR}: identify failed: ${N2_COLOR}${NVMMCTL_CMD} identify${N1_COLOR}${N0_COLOR}"
1115+
${ECHO} "${N2_COLOR}nvmm_module_auto_load${N1_COLOR} options is enabled via nvmm.conf, trying to load the module automatically via: ${N2_COLOR}kldload nvmm...${N0_COLOR}"
1116+
sync
1117+
sleep 1
1118+
${KLDLOAD_CMD} nvmm
1119+
_ret=$?
1120+
if [ ${_ret} -ne 1 ]; then
1121+
${ECHO} "${N1_COLOR}done, re-check..${N0_COLOR}"
1122+
${NVMMCTL_CMD} identify
1123+
_ret=$?
1124+
if [ ${_ret} -ne 0 ]; then
1125+
${ECHO} "${W1_COLOR}Warning${N1_COLOR}: identify failed: ${N2_COLOR}${NVMMCTL_CMD} identify${N1_COLOR}. Acceleration disabled. It will work slowly${N0_COLOR}"
1126+
_accel=0
1127+
else
1128+
${ECHO} "${N1_COLOR}machine_accel auto: ${N2_COLOR}${NVMMCTL_CMD} found!${N0_COLOR}"
1129+
_accel=1
1130+
_accel_auto="nvmm"
1131+
fi
1132+
else
1133+
echo "failed"
1134+
_accel=0
1135+
fi
1136+
else
1137+
${ECHO} "${N2_COLOR}nvmm_module_auto_load${N1_COLOR} options is disabled via nvmm.conf${N0_COLOR}"
1138+
${ECHO} "${W1_COLOR}Warning${N1_COLOR}: identify failed: ${N2_COLOR}${NVMMCTL_CMD} identify${N0_COLOR}"
1139+
${ECHO} "${W1_COLOR}Warning${N1_COLOR}: is nvmm module loaded?: ${N2_COLOR}kldload nvmm${N0_COLOR}"
1140+
${ECHO} "${W1_COLOR}Warning${N1_COLOR}: If nvmm module exist, please add to /boot/loader.conf: ${N2_COLOR}nvmm_load=YES${N0_COLOR}"
1141+
${ECHO} "${W1_COLOR}Warning${N1_COLOR}: Acceleration disabled. It will work slowly${N0_COLOR}"
1142+
_accel=0
1143+
fi
11141144
else
11151145
_accel=1
11161146
_accel_auto="nvmm"

0 commit comments

Comments
 (0)