From 1b390616d6ca32bc0b5202c81bd986a7d8a840d4 Mon Sep 17 00:00:00 2001
From: Jakub Filo <plantroon@plantroon.com>
Date: Sun, 16 Jan 2022 04:48:17 +0000
Subject: [PATCH] Add TPM config for Windows 11

---
 examples/libvirt/rift.xml | 58 +++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/examples/libvirt/rift.xml b/examples/libvirt/rift.xml
index 9bab7a9..4268b0c 100644
--- a/examples/libvirt/rift.xml
+++ b/examples/libvirt/rift.xml
@@ -1,4 +1,4 @@
-<domain type='kvm' id='22' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+<domain type='kvm' id='2' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
   <name>rift</name>
   <uuid>cfb2303a-a75e-4bcb-9adc-2f4d10c74c66</uuid>
   <metadata>
@@ -28,7 +28,7 @@
     <partition>/machine</partition>
   </resource>
   <os>
-    <type arch='x86_64' machine='pc-q35-6.1'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram>/var/lib/libvirt/qemu/nvram/rift_VARS.fd</nvram>
     <boot dev='hd'/>
@@ -138,7 +138,7 @@
     <interface type='bridge'>
       <mac address='52:54:00:e0:10:18'/>
       <source bridge='virbr0'/>
-      <target dev='vnet21'/>
+      <target dev='vnet1'/>
       <model type='virtio'/>
       <filterref filter='allow-ipv4'/>
       <alias name='net0'/>
@@ -150,29 +150,17 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <audio id='1' type='none'/>
-    <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
-      <source>
-        <address domain='0x0000' bus='0x00' slot='0x14' function='0x0'/>
-      </source>
-      <alias name='hostdev0'/>
-      <address type='pci' domain='0x0000' bus='0x09' slot='0x01' function='0x0'/>
-    </hostdev>
-    <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
-      <source>
-        <address domain='0x0000' bus='0x00' slot='0x14' function='0x2'/>
-      </source>
-      <alias name='hostdev1'/>
-      <address type='pci' domain='0x0000' bus='0x09' slot='0x02' function='0x0'/>
-    </hostdev>
+    <tpm model='tpm-tis'>
+      <backend type='emulator' version='2.0'/>
+      <alias name='tpm0'/>
+    </tpm>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
       </source>
-      <alias name='hostdev2'/>
+      <alias name='hostdev0'/>
+      <rom file='/usr/share/ovmf/nv.rom'/>
       <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
@@ -180,9 +168,33 @@
       <source>
         <address domain='0x0000' bus='0x01' slot='0x00' function='0x1'/>
       </source>
-      <alias name='hostdev3'/>
+      <alias name='hostdev1'/>
       <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
     </hostdev>
+    <hostdev mode='subsystem' type='pci' managed='yes'>
+      <driver name='vfio'/>
+      <source>
+        <address domain='0x0000' bus='0x00' slot='0x14' function='0x0'/>
+      </source>
+      <alias name='hostdev2'/>
+      <address type='pci' domain='0x0000' bus='0x09' slot='0x01' function='0x0'/>
+    </hostdev>
+    <hostdev mode='subsystem' type='pci' managed='yes'>
+      <driver name='vfio'/>
+      <source>
+        <address domain='0x0000' bus='0x00' slot='0x14' function='0x2'/>
+      </source>
+      <alias name='hostdev3'/>
+      <address type='pci' domain='0x0000' bus='0x09' slot='0x02' function='0x0'/>
+    </hostdev>
+    <hostdev mode='subsystem' type='pci' managed='yes'>
+      <driver name='vfio'/>
+      <source>
+        <address domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
+      </source>
+      <alias name='hostdev4'/>
+      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
+    </hostdev>
     <memballoon model='none'/>
   </devices>
   <seclabel type='dynamic' model='apparmor' relabel='yes'>
@@ -197,4 +209,4 @@
     <qemu:arg value='-cpu'/>
     <qemu:arg value='host,hv_time,kvm=off,hv_vendor_id=null'/>
   </qemu:commandline>
-</domain>
\ No newline at end of file
+</domain>