From d20ddaff74976c8abb35c353b9ca1f76c3961478 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Sat, 16 Mar 2024 16:35:41 +0100
Subject: [PATCH 1/2] Replace USB controllers with `qemu-xhci` for macOS Sonoma
 support

As per <https://www.reddit.com/r/MacOS/comments/17a9tge/usb_keyboard_no_longer_works_after_upgrading_to/>
---
 tools/template.xml.in | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/tools/template.xml.in b/tools/template.xml.in
index 8939d8b..b408768 100644
--- a/tools/template.xml.in
+++ b/tools/template.xml.in
@@ -44,20 +44,8 @@
       <target dev='sdb' bus='sata'/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
-    <controller type='usb' index='0' model='ich9-ehci1'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x7'/>
-    </controller>
-    <controller type='usb' index='0' model='ich9-uhci1'>
-      <master startport='0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='usb' index='0' model='ich9-uhci2'>
-      <master startport='2'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x1'/>
-    </controller>
-    <controller type='usb' index='0' model='ich9-uhci3'>
-      <master startport='4'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x2'/>
+    <controller type='usb' index='0' model='qemu-xhci' ports='7'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0'/>
     </controller>
     <controller type='sata' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>

From 0c706ba2df2618950fab681a0ebf1a8d51611c94 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Sun, 17 Mar 2024 05:03:09 +0100
Subject: [PATCH 2/2] Remove unnecessary option

---
 tools/template.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/template.xml.in b/tools/template.xml.in
index b408768..dadd73b 100644
--- a/tools/template.xml.in
+++ b/tools/template.xml.in
@@ -44,7 +44,7 @@
       <target dev='sdb' bus='sata'/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='7'>
+    <controller type='usb' index='0' model='qemu-xhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0'/>
     </controller>
     <controller type='sata' index='0'>