update config for new software version

playbook.yml

@@ -10,7 +10,8 @@
       - '046d:c539' # Logitech, Inc. USB Receiver
       - '046d:c08d' # Logitech, Inc. G502 LIGHTSPEED Wireless Gaming Mouse
     keyboards:
-      - '/dev/input/by-id/usb-0d3d_USBPS2-event-kbd'
+      # - '/dev/input/by-id/usb-0d3d_USBPS2-event-kbd'
+      - '/dev/input/by-path/platform-i8042-serio-0-event-kbd'
     mice: []
   roles:
     - win10

roles/win10/files/hooks/qemu

@@ -7,8 +7,8 @@ prepare() {
         drop-caches \
         compact-memory \
         irq-affinity mask C1-3,5-7 \
-        cpuset-create --cpus C0,4 /host.slice \
+        cpuset-modify --cpus C0,4 /system.slice \
-        cpuset-create --cpus C1-3,5-7 -nlb /win10.slice \
+        cpuset-modify --cpus C0,4 /user.slice \
         move-tasks / /host.slice \
         cpu-governor performance C0-7
 
@@ -21,15 +21,8 @@ prepare() {
 }
 
 release() {
-    echo "Restore system"
-
-    # restore cgroupv2
-    systemctl set-property --runtime -- user.slice AllowedCPUs=0,1,2,3,4,5,6,7
-    systemctl set-property --runtime -- system.slice AllowedCPUs=0,1,2,3,4,5,6,7
-    systemctl set-property --runtime -- init.scope AllowedCPUs=0,1,2,3,4,5,6,7
-
-    vfio-isolate restore /tmp/win10.undo
     systemctl stop win10-usb
+    vfio-isolate restore /tmp/win10.undo
     sysctl -w vm.nr_hugepages=0
 }
 

roles/win10/templates/win10.xml

@@ -64,7 +64,7 @@
     <cache mode='passthrough'/>
     <feature policy='require' name='invtsc'/>
     <!-- required for Genshin Impact, come with a performance hit -->
-    <feature policy="disable" name="hypervisor"/>
+    <!-- <feature policy="disable" name="hypervisor"/> -->
   </cpu>
   <clock offset='localtime'>
     <timer name='rtc' present='no' tickpolicy='catchup'/>
@@ -173,7 +173,9 @@
       <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='mouse' bus='virtio'/>
     <input type='keyboard' bus='ps2'/>
+    <input type='keyboard' bus='virtio'/>
     <graphics type='spice'>
         <listen type='socket' socket='/tmp/win10-spice.sock'/>
         <image compression='off' />
@@ -218,17 +220,19 @@
       <size unit='M'>32</size>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x04' function='0x0'/>
     </shmem>
-  </devices>
-  <qemu:commandline>
-    <!-- keyboard evdev passthrough -->
-    {% for item in keyboards %}
-    <qemu:arg value='-object'/>
-    <qemu:arg value='input-linux,id=kbd1,evdev=/dev/input/by-id/uinput-persist-keyboard{{ loop.index0 }},grab_all=off,repeat=on'/>
-    {% endfor %}
     <!-- mouse evdev passthrough -->
     {% for item in mice %}
-    <qemu:arg value='-object'/>
+    <input type='evdev'>
-    <qemu:arg value='input-linux,id=input5,evdev=/dev/input/by-id/uinput-persist-mouse{{ loop.index0 }}'/>
+      <source dev='/dev/input/by-id/uinput-persist-mouse{{ loop.index0 }}'/>
+    </input>
     {% endfor %}
+    <!-- keyboard evdev passthrough -->
+    {% for item in keyboards %}
+    <input type='evdev'>
+      <source dev='/dev/input/by-id/uinput-persist-keyboard{{ loop.index0 }}' grab='all' repeat='on'/>
+    </input>
+    {% endfor %}
+  </devices>
+  <qemu:commandline>
   </qemu:commandline>
 </domain>