From 77f44a0780d72a3d62adaaa3fed64dfe04b5bd0b Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Mon, 8 May 2023 10:57:52 +0100
Subject: [PATCH] Update vfio config

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 .../hooks/win10-igpu/prepare/begin/start.sh   |  6 ++----
 .../hooks/win10-igpu/release/end/revert.sh    |  6 ++----
 xml/win10-igpu.xml                            | 19 ++++++++++---------
 xml/win10.xml                                 | 15 ++++++++-------
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/scripts/hooks/win10-igpu/prepare/begin/start.sh b/scripts/hooks/win10-igpu/prepare/begin/start.sh
index 69f1e4d..bef33f4 100644
--- a/scripts/hooks/win10-igpu/prepare/begin/start.sh
+++ b/scripts/hooks/win10-igpu/prepare/begin/start.sh
@@ -46,10 +46,8 @@ modprobe -r nvidia
 virsh nodedev-detach $VIRSH_GPU_VIDEO
 virsh nodedev-detach $VIRSH_GPU_AUDIO
 
-# Load VFIO kernel modules
-modprobe vfio
-modprobe vfio_pci
-modprobe vfio_iommu_type1
+# Load VFIO kernel module
+modprobe vfio-pci
 
 # Create looking glass shm
 systemd-tmpfiles --create /etc/tmpfiles.d/10-looking-glass.conf
diff --git a/scripts/hooks/win10-igpu/release/end/revert.sh b/scripts/hooks/win10-igpu/release/end/revert.sh
index 70e9f4a..1af67f9 100644
--- a/scripts/hooks/win10-igpu/release/end/revert.sh
+++ b/scripts/hooks/win10-igpu/release/end/revert.sh
@@ -18,10 +18,8 @@ cat /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
 # Delete looking glass shm
 rm /dev/shm/looking-glass
 
-# Unload VFIO kernel modules
-modprobe -r vfio_pci
-modprobe -r vfio_iommu_type1
-modprobe -r vfio
+# Unload VFIO kernel module
+modprobe -r vfio-pci
 
 # Rebind the GPU to display driver
 virsh nodedev-reattach $VIRSH_GPU_VIDEO
diff --git a/xml/win10-igpu.xml b/xml/win10-igpu.xml
index 21af61c..9075622 100644
--- a/xml/win10-igpu.xml
+++ b/xml/win10-igpu.xml
@@ -1,14 +1,14 @@
 <!--
 WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh edit win10-igpu
+  virsh edit win11-igpu
 or other application using the libvirt API.
 -->
 
 <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
-  <name>win10-igpu</name>
+  <name>win11-igpu</name>
   <uuid>fcac9afe-ee92-4803-a744-62b940e23e18</uuid>
-  <title>Windows 10 - Passthrough (Hybrid Mode)</title>
+  <title>Windows 11 - Passthrough (Hybrid Mode)</title>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
       <libosinfo:os id="http://microsoft.com/win/10"/>
@@ -37,9 +37,10 @@ or other application using the libvirt API.
   <os>
     <type arch='x86_64' machine='pc-q35-6.2'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2-ovmf/x64/OVMF_CODE.fd</loader>
-    <nvram>/var/lib/libvirt/qemu/nvram/win10-igpu_VARS.fd</nvram>
+    <nvram>/var/lib/libvirt/qemu/nvram/win11-igpu_VARS.fd</nvram>
     <boot dev='hd'/>
     <bootmenu enable='no'/>
+    <smbios mode='host'/>
   </os>
   <features>
     <acpi/>
@@ -88,7 +89,7 @@ or other application using the libvirt API.
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
-      <source file='/home/nick/VMs/Win10/virtio-win-0.1.215.iso'/>
+      <source file='/home/nick/VMs/Win11/virtio-win-0.1.229.iso'/>
       <target dev='sdb' bus='sata'/>
       <readonly/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
@@ -186,6 +187,7 @@ or other application using the libvirt API.
       <mac address='52:54:00:a7:98:7b'/>
       <source network='default'/>
       <model type='virtio'/>
+      <link state='up'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
     </interface>
     <channel type='spicevmc'>
@@ -206,11 +208,9 @@ or other application using the libvirt API.
       <gl enable='no'/>
     </graphics>
     <sound model='ich9'>
-      <codec type='micro'/>
-      <audio id='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
     </sound>
-    <audio id='1' type='pulseaudio' serverName='/run/user/1000/pulse/native'/>
+    <audio id='1' type='spice'/>
     <video>
       <model type='none'/>
     </video>
@@ -232,6 +232,7 @@ or other application using the libvirt API.
     <redirdev bus='usb' type='spicevmc'>
       <address type='usb' bus='0' port='3'/>
     </redirdev>
+    <watchdog model='itco' action='reset'/>
     <memballoon model='none'/>
     <shmem name='looking-glass'>
       <model type='ivshmem-plain'/>
@@ -241,6 +242,6 @@ or other application using the libvirt API.
   </devices>
   <qemu:commandline>
     <qemu:arg value='-acpitable'/>
-    <qemu:arg value='file=/home/nick/VMs/Win10/SSDT1.dat'/>
+    <qemu:arg value='file=/home/nick/VMs/Win11/SSDT1.dat'/>
   </qemu:commandline>
 </domain>
diff --git a/xml/win10.xml b/xml/win10.xml
index 80269ea..f687005 100644
--- a/xml/win10.xml
+++ b/xml/win10.xml
@@ -1,14 +1,14 @@
 <!--
 WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh edit win10
+  virsh edit win11
 or other application using the libvirt API.
 -->
 
 <domain type='kvm'>
-  <name>win10</name>
+  <name>win11</name>
   <uuid>f2e93cfa-83b9-4f55-ab44-da4fe7373ac4</uuid>
-  <title>Windows 10 - No Passthrough</title>
+  <title>Windows 11 - No Passthrough</title>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
       <libosinfo:os id="http://microsoft.com/win/10"/>
@@ -37,7 +37,7 @@ or other application using the libvirt API.
   <os>
     <type arch='x86_64' machine='pc-q35-6.2'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/edk2-ovmf/x64/OVMF_CODE.fd</loader>
-    <nvram>/var/lib/libvirt/qemu/nvram/win10_VARS.fd</nvram>
+    <nvram>/var/lib/libvirt/qemu/nvram/win11_VARS.fd</nvram>
     <boot dev='hd'/>
     <bootmenu enable='no'/>
   </os>
@@ -87,10 +87,10 @@ or other application using the libvirt API.
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
-      <source file='/home/nick/VMs/Win10/virtio-win-0.1.215.iso'/>
-      <target dev='sdb' bus='sata'/>
+      <source file='/home/nick/VMs/Win11/virtio-win-0.1.229.iso'/>
+      <target dev='sda' bus='sata'/>
       <readonly/>
-      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <controller type='usb' index='0' model='qemu-xhci' ports='15'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
@@ -214,6 +214,7 @@ or other application using the libvirt API.
     <redirdev bus='usb' type='spicevmc'>
       <address type='usb' bus='0' port='3'/>
     </redirdev>
+    <watchdog model='itco' action='reset'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
     </memballoon>