From 6b009b3bf14b6cb0c0b01ca08de6171c72e5ea8d Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sun, 4 Feb 2024 14:46:30 +0100
Subject: [PATCH 1/2] feat: Add L3 cache

---
 src/proc.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/proc.sh b/src/proc.sh
index 48de6cce..f43094e3 100644
--- a/src/proc.sh
+++ b/src/proc.sh
@@ -6,7 +6,7 @@ set -Eeuo pipefail
 : "${KVM:="Y"}"
 : "${HOST_CPU:=""}"
 : "${CPU_FLAGS:=""}"
-: "${CPU_MODEL:="host"}"
+: "${CPU_MODEL:="qemu64"}"
 
 [ "$ARCH" != "amd64" ] && KVM="N"
 
@@ -37,8 +37,9 @@ fi
 
 if [[ "$KVM" != [Nn]* ]]; then
 
-  CPU_FEATURES="kvm=on"
+  CPU_MODEL="host"
   KVM_OPTS=",accel=kvm -enable-kvm"
+  CPU_FEATURES="kvm=on,l3-cache=on,migratable=no"
 
   if ! grep -qE '^flags.* (sse4_2)' /proc/cpuinfo; then
     error "Your host CPU does not have the SSE4.2 instruction set that Virtual DSM requires to boot."
@@ -49,17 +50,15 @@ if [[ "$KVM" != [Nn]* ]]; then
 else
 
   KVM_OPTS=""
-  CPU_FEATURES="+ssse3,+sse4.1,+sse4.2"
+  CPU_FEATURES="l3-cache=on"
 
-  if [[ "${CPU_MODEL,,}" == "host"* ]]; then
-
-    if [[ "$ARCH" == "amd64" ]]; then
+  if [[ "$ARCH" == "amd64" ]]; then
       CPU_MODEL="max"
-    else
-      CPU_MODEL="qemu64"
-    fi
-
+      CPU_FEATURES="$CPU_FEATURES,migratable=no"
   fi
+
+  CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2"
+
 fi
 
 if [ -z "$CPU_FLAGS" ]; then

From 49a45be8962f2540442f54a7c8b19d7b3d3628b4 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sun, 4 Feb 2024 19:21:41 +0100
Subject: [PATCH 2/2] feat: Multi-threaded TCG

---
 src/proc.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/proc.sh b/src/proc.sh
index f43094e3..1c545a96 100644
--- a/src/proc.sh
+++ b/src/proc.sh
@@ -53,8 +53,9 @@ else
   CPU_FEATURES="l3-cache=on"
 
   if [[ "$ARCH" == "amd64" ]]; then
-      CPU_MODEL="max"
-      CPU_FEATURES="$CPU_FEATURES,migratable=no"
+    CPU_MODEL="max"
+    KVM_OPTS=" -accel tcg,thread=multi"
+    CPU_FEATURES="$CPU_FEATURES,migratable=no"
   fi
 
   CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2"