feat: Update error message for KVM acceleration (#1023)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/check.yml

@@ -17,7 +17,7 @@ jobs:
           SHELLCHECK_OPTS: -x --source-path=src -e SC2001 -e SC2034 -e SC2064 -e SC2317 -e SC2153 -e SC2028
       - 
         name: Lint Dockerfile
-        uses: hadolint/hadolint-action@v3.2.0
+        uses: hadolint/hadolint-action@v3.3.0
         with:
           dockerfile: Dockerfile
           ignore: DL3008,DL3003,DL3006,DL3013

src/proc.sh

@@ -7,7 +7,6 @@ set -Eeuo pipefail
 : "${HOST_CPU:=""}"
 : "${CPU_FLAGS:=""}"
 : "${CPU_MODEL:=""}"
-: "${DEF_MODEL:="qemu64"}"
 
 CLOCKSOURCE="tsc"
 [[ "${ARCH,,}" == "arm64" ]] && CLOCKSOURCE="arch_sys_counter"
@@ -27,9 +26,13 @@ else
   esac
 fi
 
-if [[ "${ARCH,,}" != "amd64" ]]; then
+if [[ "$KVM" == [Nn]* ]]; then
-  KVM="N"
+  warn "KVM acceleration is disabled, this will cause the machine to run about 10 times slower!"
-  warn "your CPU architecture is ${ARCH^^} and cannot provide KVM acceleration for x64 instructions, this will cause a major loss of performance."
+else
+  if [[ "${ARCH,,}" != "amd64" ]]; then
+    KVM="N"
+    warn "your CPU architecture is ${ARCH^^} and cannot provide KVM acceleration for x64 instructions, so the machine will run about 10 times slower."
+  fi
 fi
 
 if [[ "$KVM" != [Nn]* ]]; then
@@ -52,8 +55,8 @@ if [[ "$KVM" != [Nn]* ]]; then
   if [ -n "$KVM_ERR" ]; then
     KVM="N"
     if [[ "$OSTYPE" =~ ^darwin ]]; then
-      warn "you are using macOS which has no KVM support, this will cause a major loss of performance."
+      warn "you are using macOS which has no KVM support, so the machine will run about 10 times slower."
-    else      
+    else
       kernel=$(uname -a)
       case "${kernel,,}" in
         *"microsoft"* )
@@ -61,8 +64,8 @@ if [[ "$KVM" != [Nn]* ]]; then
         *"synology"* )
           error "Please make sure that Synology VMM (Virtual Machine Manager) is installed and that '/dev/kvm' is binded to this container." ;;
         *)
-          error "KVM acceleration is not available $KVM_ERR, this will cause a major loss of performance."
+          error "KVM acceleration is not available $KVM_ERR, this will cause the machine to run about 10 times slower."
-          error "See the FAQ for possible causes, or continue without it by adding KVM: \"N\" (not recommended)." ;;
+          error "See the FAQ for possible causes, or disable acceleration by adding the \"KVM=N\" variable (not recommended)." ;;
       esac
       [[ "$DEBUG" != [Yy1]* ]] && exit 88
     fi
@@ -77,7 +80,7 @@ if [[ "$KVM" != [Nn]* ]]; then
 
   if ! grep -qw "sse4_2" <<< "$flags"; then
     info "Your CPU does not have the SSE4 instruction set that Virtual DSM requires, it will be emulated..."
-    [ -z "$CPU_MODEL" ] && CPU_MODEL="$DEF_MODEL"
+    [ -z "$CPU_MODEL" ] && CPU_MODEL="qemu64"
     CPU_FEATURES+=",+ssse3,+sse4.1,+sse4.2"
   fi
 
@@ -120,7 +123,7 @@ else
       CPU_MODEL="max"
       CPU_FEATURES+=",migratable=no"
     else
-      CPU_MODEL="$DEF_MODEL"
+      CPU_MODEL="qemu64"
     fi
   fi
 

src/reset.sh

@@ -48,8 +48,15 @@ else
   SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
 fi
 
+CPU_CORES="${CPU_CORES// /}"
+[[ "${CPU_CORES,,}" == "max" ]] && CPU_CORES="$CORES"
 [ -n "${CPU_CORES//[0-9 ]}" ] && error "Invalid amount of CPU_CORES: $CPU_CORES" && exit 15
 
+if [ "$CPU_CORES" -gt "$CORES" ]; then
+  warn "The amount for CPU_CORES (${CPU_CORES}) exceeds the amount of physical cores, so will be limited to ${CORES}."
+  CPU_CORES="$CORES"
+fi
+
 # Check system
 
 if [ ! -d "/dev/shm" ]; then
@@ -89,6 +96,12 @@ RAM_TOTAL=$(free -b | grep -m 1 Mem: | awk '{print $2}')
 RAM_SIZE="${RAM_SIZE// /}"
 [ -z "$RAM_SIZE" ] && error "RAM_SIZE not specified!" && exit 16
 
+if [[ "${RAM_SIZE,,}" == "max" ]]; then
+  RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE - RAM_SPARE ))
+  RAM_WANTED=$(( RAM_WANTED / 1073741825 ))
+  RAM_SIZE="${RAM_WANTED}G"
+fi
+
 if [ -z "${RAM_SIZE//[0-9. ]}" ]; then
   [ "${RAM_SIZE%%.*}" -lt "130" ] && RAM_SIZE="${RAM_SIZE}G" || RAM_SIZE="${RAM_SIZE}M"
 fi