From d4feec5a06199cd40f12a41ee2af6bbb2975635f Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 2 Feb 2024 18:58:31 +0100
Subject: [PATCH] fix: Use VGA adaptor for Windows (#3)

---
 src/config.sh  | 2 +-
 src/display.sh | 6 +++++-
 src/entry.sh   | 2 +-
 src/proc.sh    | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/config.sh b/src/config.sh
index 4fe21d9..9d32d5c 100644
--- a/src/config.sh
+++ b/src/config.sh
@@ -11,7 +11,7 @@ MON_OPTS="-monitor $MONITOR"
 USB_OPTS="-device $USB -device usb-kbd -device usb-tablet"
 RAM_OPTS=$(echo "-m $RAM_SIZE" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
-MAC_OPTS="-machine type=${MACHINE},dump-guest-core=off,${KVM_OPTS}"
+MAC_OPTS="-machine type=${MACHINE},virtualization=true,dump-guest-core=off${KVM_OPTS}"
 DEV_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
 DEV_OPTS="$DEV_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
 DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
diff --git a/src/display.sh b/src/display.sh
index 05f6d1a..a836fc2 100644
--- a/src/display.sh
+++ b/src/display.sh
@@ -6,6 +6,10 @@ set -Eeuo pipefail
 : "${DISPLAY:="web"}"       # Display type
 : "${VGA:="virtio-gpu"}"    # VGA adaptor
 
+if [[ "${BOOT_MODE,,}" == "windows" ]]; then
+  [[ "$VGA" == "virtio-gpu" ]] && VGA="VGA"
+fi
+
 case "${DISPLAY,,}" in
   vnc)
     DISPLAY_OPTS="-display vnc=:0 -device $VGA"
@@ -15,7 +19,7 @@ case "${DISPLAY,,}" in
     ;;
   ramfb)
     DISPLAY_OPTS="-display vnc=:0,websocket=5700 -device ramfb"
-    ;;    
+    ;;
   none)
     DISPLAY_OPTS="-display none"
     ;;
diff --git a/src/entry.sh b/src/entry.sh
index e438fdd..7a6cab1 100755
--- a/src/entry.sh
+++ b/src/entry.sh
@@ -9,9 +9,9 @@ cd /run
 . reset.sh      # Initialize system
 . install.sh    # Get bootdisk
 . disk.sh       # Initialize disks
-. display.sh    # Initialize graphics
 . network.sh    # Initialize network
 . boot.sh       # Configure boot
+. display.sh    # Initialize graphics
 . proc.sh       # Initialize processor
 . config.sh     # Configure arguments
 
diff --git a/src/proc.sh b/src/proc.sh
index 87d4653..9c6a177 100644
--- a/src/proc.sh
+++ b/src/proc.sh
@@ -33,7 +33,7 @@ fi
 if [[ "$KVM" != [Nn]* ]]; then
 
   CPU_FEATURES="kvm=on"
-  KVM_OPTS=",accel=kvm,virtualization=true -enable-kvm"
+  KVM_OPTS=",accel=kvm -enable-kvm"
 
   if [[ "${BOOT_MODE,,}" == "windows" ]]; then
 
@@ -51,7 +51,7 @@ else
     if [[ "$ARCH" == "arm"* ]]; then
       CPU_MODEL="max"
     else
-      CPU_MODEL="cortex-a76"
+      CPU_MODEL="cortex-a57"
     fi
 
   fi