From cf08da8c60891836fd16ccde3e8f0299cf475d45 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 19 Oct 2024 22:33:38 +0200
Subject: [PATCH] feat: Disable USB for legacy machines

---
 src/define.sh | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/define.sh b/src/define.sh
index d24834a..c1f2127 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -2106,35 +2106,33 @@ setMachine() {
   local dir="$3"
   local desc="$4"
 
-  case "${id,,}" in
-    "win9"* | "win2k"* )
-      MACHINE="pc-i440fx-2.4" ;;
-    "winxp"* | "win2003"* | "winvistax86"* | "win7x86"* )
-      # Some 32-bit Windows crash if 64 bit PCI hole size is >2G.
-      ARGS="-global q35-pcihost.x-pci-hole64-fix=false" ;;
-  esac
-
   case "${id,,}" in
     "win9"* )
-      DISK_TYPE="auto"
-      BOOT_MODE="windows_legacy"
       ETFS="[BOOT]/Boot-1.44M.img" ;;
     "win2k"* )
-      DISK_TYPE="auto"
-      BOOT_MODE="windows_legacy"
       ETFS="[BOOT]/Boot-NoEmul.img" ;;
     "winxp"* )
-      DISK_TYPE="blk"
-      BOOT_MODE="windows_legacy"
       if ! prepareXP "$iso" "$dir" "$desc"; then
         error "Failed to prepare $desc ISO!" && return 1
       fi ;;
     "win2003"* )
-      DISK_TYPE="blk"
-      BOOT_MODE="windows_legacy"
       if ! prepare2k3 "$iso" "$dir" "$desc"; then
         error "Failed to prepare $desc ISO!" && return 1
       fi ;;
+  esac
+
+  case "${id,,}" in
+    "win9"* | "win2k"* )
+      USB="None"
+      DISK_TYPE="auto"
+      MACHINE="pc-i440fx-2.4"
+      BOOT_MODE="windows_legacy" ;;
+    "winxp"* | "win2003"* )
+      USB="None"
+      DISK_TYPE="blk"
+      BOOT_MODE="windows_legacy"
+      # Some 32-bit Windows crash if 64 bit PCI hole size is >2G.
+      ARGS="-global q35-pcihost.x-pci-hole64-fix=false" ;;
     "winvista"* | "win7"* | "win2008"* )
       BOOT_MODE="windows_legacy" ;;
   esac