From 0d7e26adad4f5a6417facb74db7c074cada7d29a Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 10 Aug 2026 11:36:13 +0200
Subject: [PATCH] feat: Use removeState helper from base (#2127)

---
 src/define.sh | 2 +-
 src/legacy.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/define.sh b/src/define.sh
index 18845dfa..cfe9e509 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -1069,7 +1069,7 @@ supportsBootKey() {
       return 0 ;;
   esac
 
-  return 1
+  return 0
 }
 
 supportsXML() {
diff --git a/src/legacy.sh b/src/legacy.sh
index b85bf32c..fd936c04 100644
--- a/src/legacy.sh
+++ b/src/legacy.sh
@@ -44,9 +44,9 @@ setMachine() {
     "win9"* | "winnt4" )
 
       writeState "old" "pc" || return 1
-      writeState "usb" "N" || return 1
       writeState "net" "pcnet" || return 1
-      writeState "type" "auto" || return 1 ;;
+      writeState "type" "auto" || return 1
+      writeState "usb" "pci-ohci" || return 1 ;;
 
     "win2k"* )
 
@@ -129,7 +129,7 @@ restoreMachine() {
   # Migrate existing WinXP installs to QEMU 10
   if [[ "${MACHINE,,}" == "pc-q35-2.10" ]]; then
     MACHINE=""
-    rm -f -- "$(stateFile "old")"
+    removeState "old" || return 1
   fi
 
   [ -z "$MACHINE" ] && MACHINE="q35"