From e7631282f1ce47c7e0c662a67352181e255ea43d Mon Sep 17 00:00:00 2001
From: Cole Deck <cole@deck.sh>
Date: Fri, 24 Jul 2020 22:56:10 -0500
Subject: [PATCH] Update libvirt XML with hugepages and cache fixes

---
 win10.xml | 49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/win10.xml b/win10.xml
index 07f34d8..0651665 100755
--- a/win10.xml
+++ b/win10.xml
@@ -13,9 +13,30 @@ or other application using the libvirt API.
       <libosinfo:os id="http://microsoft.com/win/10"/>
     </libosinfo:libosinfo>
   </metadata>
-  <memory unit='KiB'>20280320</memory>
-  <currentMemory unit='KiB'>20280320</currentMemory>
-  <vcpu placement='static'>12</vcpu>
+  <memory unit='KiB'>16777216</memory>
+  <currentMemory unit='KiB'>16777216</currentMemory>
+  <memoryBacking>
+    <hugepages/>
+  </memoryBacking>
+  <vcpu placement='static' current='12'>16</vcpu>
+  <vcpus>
+    <vcpu id='0' enabled='yes' hotpluggable='no'/>
+    <vcpu id='1' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='2' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='3' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='4' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='5' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='6' enabled='no' hotpluggable='yes'/>
+    <vcpu id='7' enabled='no' hotpluggable='yes'/>
+    <vcpu id='8' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='9' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='10' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='11' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='12' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='13' enabled='yes' hotpluggable='yes'/>
+    <vcpu id='14' enabled='no' hotpluggable='yes'/>
+    <vcpu id='15' enabled='no' hotpluggable='yes'/>
+  </vcpus>
   <iothreads>1</iothreads>
   <cputune>
     <vcpupin vcpu='0' cpuset='2'/>
@@ -24,14 +45,14 @@ or other application using the libvirt API.
     <vcpupin vcpu='3' cpuset='5'/>
     <vcpupin vcpu='4' cpuset='6'/>
     <vcpupin vcpu='5' cpuset='7'/>
-    <vcpupin vcpu='6' cpuset='8'/>
-    <vcpupin vcpu='7' cpuset='9'/>
-    <vcpupin vcpu='8' cpuset='10'/>
-    <vcpupin vcpu='9' cpuset='11'/>
-    <vcpupin vcpu='10' cpuset='12'/>
-    <vcpupin vcpu='11' cpuset='13'/>
-    <emulatorpin cpuset='0-1,14-15'/>
-    <iothreadpin iothread='1' cpuset='0-1,14-15'/>
+    <vcpupin vcpu='8' cpuset='8'/>
+    <vcpupin vcpu='9' cpuset='9'/>
+    <vcpupin vcpu='10' cpuset='10'/>
+    <vcpupin vcpu='11' cpuset='11'/>
+    <vcpupin vcpu='12' cpuset='12'/>
+    <vcpupin vcpu='13' cpuset='13'/>
+    <emulatorpin cpuset='0-1'/>
+    <iothreadpin iothread='1' cpuset='14-15'/>
   </cputune>
   <os>
     <type arch='x86_64' machine='pc-q35-5.0'>hvm</type>
@@ -47,6 +68,10 @@ or other application using the libvirt API.
       <relaxed state='on'/>
       <vapic state='on'/>
       <spinlocks state='on' retries='8191'/>
+      <vpindex state='on'/>
+      <runtime state='on'/>
+      <synic state='on'/>
+      <stimer state='on'/>
       <vendor_id state='on' value='087D1028'/>
     </hyperv>
     <kvm>
@@ -55,7 +80,7 @@ or other application using the libvirt API.
     <vmport state='off'/>
   </features>
   <cpu mode='host-passthrough' check='none' migratable='on'>
-    <topology sockets='1' dies='1' cores='6' threads='2'/>
+    <topology sockets='1' dies='1' cores='8' threads='2'/>
     <cache mode='passthrough'/>
     <feature policy='require' name='topoext'/>
   </cpu>