Libvirt update

10 files changed, 72 insertions, 71 deletions

diff --git a/hosts/corpa/lockscreen.jpg b/hosts/corpa/lockscreen.jpg
new file mode 100644
index 0000000..268e712
--- /dev/null
+++ b/hosts/corpa/lockscreen.jpg
diff --git a/hosts/corpa/image-web.jpg b/hosts/corpa/wallpaper.jpg
index f3fd8d5..f3fd8d5 100755
--- a/hosts/corpa/image-web.jpg
+++ b/hosts/corpa/wallpaper.jpg
diff --git a/hosts/corpa/winutil.json b/hosts/corpa/winutil.json
deleted file mode 100755
index 969fed0..0000000
--- a/hosts/corpa/winutil.json
+++ /dev/null
diff --git a/hosts/iroha/libvirt/hooks/arcade.conf b/hosts/iroha/libvirt/hooks/arcade.conf
index acbc430..8ea3c3c 100644
--- a/hosts/iroha/libvirt/hooks/arcade.conf
+++ b/hosts/iroha/libvirt/hooks/arcade.conf
@@ -1,3 +1,3 @@
-VIRSH_GPU_VIDEO=pci_0000_10_00_0
-VIRSH_GPU_AUDIO=pci_0000_10_00_1
+VIRSH_GPU_VIDEO=pci_0000_03_00_0
+VIRSH_GPU_AUDIO=pci_0000_03_00_1
 VIRSH_USB=pci_0000_12_00_3
diff --git a/hosts/iroha/libvirt/qemu/arcade.xml b/hosts/iroha/libvirt/qemu/arcade.xml
index 5280dc9..28177e3 100644
--- a/hosts/iroha/libvirt/qemu/arcade.xml
+++ b/hosts/iroha/libvirt/qemu/arcade.xml
@@ -32,35 +32,22 @@ or other application using the libvirt API.
     <vcpupin vcpu='11' cpuset='17'/>
     <emulatorpin cpuset='6,18'/>
     <iothreadpin iothread='1' cpuset='7,19'/>
-    <emulatorsched scheduler='fifo' priority='10'/>
-    <vcpusched vcpus='0' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='1' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='2' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='3' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='4' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='5' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='6' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='7' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='8' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='9' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='10' scheduler='fifo' priority='1'/>
-    <vcpusched vcpus='11' scheduler='fifo' priority='1'/>
   </cputune>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-9.1'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-9.2'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
     </firmware>
     <loader readonly='yes' type='pflash' format='raw'>/usr/share/edk2-ovmf/OVMF_CODE.fd</loader>
     <nvram template='/usr/share/edk2-ovmf/OVMF_VARS.fd' templateFormat='raw' format='raw'>/var/lib/libvirt/qemu/nvram/arcade_VARS.fd</nvram>
+    <boot dev='hd'/>
     <smbios mode='host'/>
   </os>
   <features>
     <acpi/>
     <apic/>
     <hyperv mode='passthrough'>
-      <vendor_id state='on' value='OriginalAMD'/>
     </hyperv>
     <kvm>
       <hidden state='on'/>
@@ -95,14 +82,6 @@ or other application using the libvirt API.
   </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' cache='writeback' io='io_uring' discard='unmap' iothread='1'/>
-      <source file='/var/lib/libvirt/images/arcade.qcow2'/>
-      <target dev='vda' bus='virtio'/>
-      <serial>WD_BLACK_SN770_1TB_230423802979_1</serial>
-      <boot order='2'/>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </disk>
     <controller type='pci' index='0' model='pcie-root'/>
     <controller type='pci' index='1' model='pcie-root-port'>
       <model name='pcie-root-port'/>
@@ -209,13 +188,13 @@ or other application using the libvirt API.
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
-        <address domain='0x0000' bus='0x10' slot='0x00' function='0x0'/>
+        <address domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
-        <address domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
+        <address domain='0x0000' bus='0x03' slot='0x00' function='0x1'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/>
     </hostdev>
diff --git a/hosts/iroha/libvirt/qemu/corpa-nogpu.xml b/hosts/iroha/libvirt/qemu/corpa-nogpu.xml
index b43ac1b..b5a2a46 100644
--- a/hosts/iroha/libvirt/qemu/corpa-nogpu.xml
+++ b/hosts/iroha/libvirt/qemu/corpa-nogpu.xml
@@ -13,16 +13,26 @@ or other application using the libvirt API.
       <libosinfo:os id="http://microsoft.com/win/11"/>
     </libosinfo:libosinfo>
   </metadata>
-  <memory unit='KiB'>12582912</memory>
-  <currentMemory unit='KiB'>12582912</currentMemory>
+  <memory unit='KiB'>16777216</memory>
+  <currentMemory unit='KiB'>16777216</currentMemory>
   <memoryBacking>
     <source type='memfd'/>
     <access mode='shared'/>
   </memoryBacking>
   <vcpu placement='static'>6</vcpu>
   <iothreads>1</iothreads>
+  <cputune>
+    <vcpupin vcpu='0' cpuset='0'/>
+    <vcpupin vcpu='1' cpuset='12'/>
+    <vcpupin vcpu='2' cpuset='1'/>
+    <vcpupin vcpu='3' cpuset='13'/>
+    <vcpupin vcpu='4' cpuset='2'/>
+    <vcpupin vcpu='5' cpuset='14'/>
+    <emulatorpin cpuset='6,18'/>
+    <iothreadpin iothread='1' cpuset='7,19'/>
+  </cputune>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-9.1'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-9.2'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
@@ -73,9 +83,24 @@ or other application using the libvirt API.
       <driver name='qemu' type='qcow2' io='io_uring' iothread='1'/>
       <source file='/var/lib/libvirt/images/corpa-1.qcow2'/>
       <target dev='vdb' bus='virtio'/>
-      <boot order='1'/>
+      <boot order='2'/>
       <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/>
     </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/home/andrew/isos/virtio-win-0.1.271.iso'/>
+      <target dev='sda' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/home/andrew/isos/en-us_windows_10_iot_enterprise_ltsc_2021_x64_dvd_257ad90f.iso'/>
+      <target dev='sdb' bus='sata'/>
+      <readonly/>
+      <boot order='1'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
     <controller type='usb' index='0' model='qemu-xhci' ports='15'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
     </controller>
@@ -178,13 +203,6 @@ or other application using the libvirt API.
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
     </interface>
-    <channel type='qemu-vdagent'>
-      <source>
-        <clipboard copypaste='yes'/>
-      </source>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
     <channel type='spicevmc'>
       <target type='virtio' name='com.redhat.spice.0'/>
       <address type='virtio-serial' controller='0' bus='0' port='1'/>
@@ -205,7 +223,7 @@ or other application using the libvirt API.
       <channel name='main' mode='insecure'/>
       <channel name='record' mode='insecure'/>
       <image compression='auto_glz'/>
-      <jpeg compression='never'/>
+      <jpeg compression='auto'/>
       <zlib compression='auto'/>
       <playback compression='on'/>
       <streaming mode='filter'/>
@@ -213,25 +231,18 @@ or other application using the libvirt API.
       <filetransfer enable='no'/>
       <gl enable='no'/>
     </graphics>
-    <graphics type='egl-headless'>
-      <gl rendernode='/dev/dri/renderD128'/>
-    </graphics>
     <sound model='ich9'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
     </sound>
-    <audio id='1' type='none'/>
+    <audio id='1' type='spice'/>
     <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <model type='qxl' ram='65536' vram='65536' vgamem='32768' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='2'/>
+    </redirdev>
     <watchdog model='itco' action='reset'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </memballoon>
-    <shmem name='looking-glass'>
-      <model type='ivshmem-plain'/>
-      <size unit='M'>32</size>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x01' function='0x0'/>
-    </shmem>
+    <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/hosts/iroha/libvirt/qemu/corpa.xml b/hosts/iroha/libvirt/qemu/corpa.xml
index af87cf2..a9b91a5 100644
--- a/hosts/iroha/libvirt/qemu/corpa.xml
+++ b/hosts/iroha/libvirt/qemu/corpa.xml
@@ -13,16 +13,26 @@ or other application using the libvirt API.
       <libosinfo:os id="http://microsoft.com/win/11"/>
     </libosinfo:libosinfo>
   </metadata>
-  <memory unit='KiB'>12582912</memory>
-  <currentMemory unit='KiB'>12582912</currentMemory>
+  <memory unit='KiB'>16777216</memory>
+  <currentMemory unit='KiB'>16777216</currentMemory>
   <memoryBacking>
     <source type='memfd'/>
     <access mode='shared'/>
   </memoryBacking>
   <vcpu placement='static'>6</vcpu>
   <iothreads>1</iothreads>
+  <cputune>
+    <vcpupin vcpu='0' cpuset='0'/>
+    <vcpupin vcpu='1' cpuset='12'/>
+    <vcpupin vcpu='2' cpuset='1'/>
+    <vcpupin vcpu='3' cpuset='13'/>
+    <vcpupin vcpu='4' cpuset='2'/>
+    <vcpupin vcpu='5' cpuset='14'/>
+    <emulatorpin cpuset='6,18'/>
+    <iothreadpin iothread='1' cpuset='7,19'/>
+  </cputune>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-9.1'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-9.2'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
@@ -76,6 +86,13 @@ or other application using the libvirt API.
       <boot order='1'/>
       <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/>
     </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/home/andrew/isos/virtio-win-0.1.271.iso'/>
+      <target dev='sdb' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
     <controller type='usb' index='0' model='qemu-xhci' ports='15'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
     </controller>
@@ -178,12 +195,9 @@ or other application using the libvirt API.
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
     </interface>
-    <channel type='qemu-vdagent'>
-      <source>
-        <clipboard copypaste='yes'/>
-      </source>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
     </channel>
     <input type='mouse' bus='virtio'>
       <address type='pci' domain='0x0000' bus='0x0b' slot='0x00' function='0x0'/>
@@ -201,7 +215,7 @@ or other application using the libvirt API.
       <channel name='main' mode='insecure'/>
       <channel name='record' mode='insecure'/>
       <image compression='auto_glz'/>
-      <jpeg compression='never'/>
+      <jpeg compression='auto'/>
       <zlib compression='auto'/>
       <playback compression='on'/>
       <streaming mode='filter'/>
@@ -221,20 +235,18 @@ or other application using the libvirt API.
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
-        <address domain='0x0000' bus='0x10' slot='0x00' function='0x0'/>
+        <address domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x09' slot='0x00' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
-        <address domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
+        <address domain='0x0000' bus='0x03' slot='0x00' function='0x1'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x0a' slot='0x00' function='0x0'/>
     </hostdev>
     <watchdog model='itco' action='reset'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
     <shmem name='looking-glass'>
       <model type='ivshmem-plain'/>
       <size unit='M'>64</size>
diff --git a/hosts/iroha/libvirt/qemu/soy.xml b/hosts/iroha/libvirt/qemu/soy.xml
index 672957b..c7a26c7 100644
--- a/hosts/iroha/libvirt/qemu/soy.xml
+++ b/hosts/iroha/libvirt/qemu/soy.xml
@@ -21,7 +21,7 @@ or other application using the libvirt API.
   </memoryBacking>
   <vcpu placement='static'>6</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-9.1'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-9.2'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -29,7 +29,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' clusters='1' cores='6' threads='1'/>
+    <topology sockets='1' dies='1' clusters='1' cores='3' threads='2'/>
     <cache mode='passthrough'/>
     <feature policy='require' name='topoext'/>
     <feature policy='require' name='invtsc'/>
diff --git a/hosts/iroha/libvirt/qemu/xp.xml b/hosts/iroha/libvirt/qemu/xp.xml
index 2ac5a2a..7572311 100644
--- a/hosts/iroha/libvirt/qemu/xp.xml
+++ b/hosts/iroha/libvirt/qemu/xp.xml
@@ -21,7 +21,7 @@ or other application using the libvirt API.
   </memoryBacking>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-9.1'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-9.2'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>
diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix
index 66852a2..2bb12d8 100644
--- a/hosts/sofue/programs.nix
+++ b/hosts/sofue/programs.nix
@@ -13,7 +13,6 @@
     wineWowPackages.staging
     winetricks
     cabextract
-    (asNeeded "looking-glass-client" ["looking-glass-client"])
     (asNeeded "qbittorrent" ["qbittorrent"])
     (asNeeded "ungoogled-chromium" ["chromium"])
     (asNeeded "brave" ["brave"])