From 85a47287e56ba9100420246531ebea5996cc0486 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Sat, 19 Jul 2025 15:50:09 -0400
Subject: End of NixOS container era

---
 hosts/iroha/libvirt/qemu/corpa-nogpu.xml | 25 ++++++++++++++-----------
 hosts/iroha/libvirt/qemu/corpa.xml       | 21 ++++++++-------------
 hosts/iroha/libvirt/qemu/xp.xml          | 12 ++++--------
 3 files changed, 26 insertions(+), 32 deletions(-)

(limited to 'hosts/iroha/libvirt/qemu')

diff --git a/hosts/iroha/libvirt/qemu/corpa-nogpu.xml b/hosts/iroha/libvirt/qemu/corpa-nogpu.xml
index b5a2a46..9078981 100644
--- a/hosts/iroha/libvirt/qemu/corpa-nogpu.xml
+++ b/hosts/iroha/libvirt/qemu/corpa-nogpu.xml
@@ -19,7 +19,7 @@ or other application using the libvirt API.
     <source type='memfd'/>
     <access mode='shared'/>
   </memoryBacking>
-  <vcpu placement='static'>6</vcpu>
+  <vcpu placement='static'>12</vcpu>
   <iothreads>1</iothreads>
   <cputune>
     <vcpupin vcpu='0' cpuset='0'/>
@@ -28,6 +28,12 @@ or other application using the libvirt API.
     <vcpupin vcpu='3' cpuset='13'/>
     <vcpupin vcpu='4' cpuset='2'/>
     <vcpupin vcpu='5' cpuset='14'/>
+    <vcpupin vcpu='6' cpuset='3'/>
+    <vcpupin vcpu='7' cpuset='15'/>
+    <vcpupin vcpu='8' cpuset='4'/>
+    <vcpupin vcpu='9' cpuset='16'/>
+    <vcpupin vcpu='10' cpuset='5'/>
+    <vcpupin vcpu='11' cpuset='17'/>
     <emulatorpin cpuset='6,18'/>
     <iothreadpin iothread='1' cpuset='7,19'/>
   </cputune>
@@ -54,7 +60,7 @@ or other application using the libvirt API.
     <msrs unknown='ignore'/>
   </features>
   <cpu mode='host-passthrough' check='none' migratable='off'>
-    <topology sockets='1' dies='1' clusters='1' cores='3' threads='2'/>
+    <topology sockets='1' dies='1' clusters='1' cores='6' threads='2'/>
     <cache mode='passthrough'/>
     <feature policy='require' name='topoext'/>
     <feature policy='require' name='hypervisor'/>
@@ -83,7 +89,7 @@ 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='2'/>
+      <boot order='1'/>
       <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/>
     </disk>
     <disk type='file' device='cdrom'>
@@ -93,14 +99,6 @@ or other application using the libvirt API.
       <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>
@@ -244,5 +242,10 @@ or other application using the libvirt API.
     </redirdev>
     <watchdog model='itco' action='reset'/>
     <memballoon model='none'/>
+    <shmem name='looking-glass'>
+      <model type='ivshmem-plain'/>
+      <size unit='M'>64</size>
+      <address type='pci' domain='0x0000' bus='0x10' slot='0x01' function='0x0'/>
+    </shmem>
   </devices>
 </domain>
diff --git a/hosts/iroha/libvirt/qemu/corpa.xml b/hosts/iroha/libvirt/qemu/corpa.xml
index a9b91a5..3c61a81 100644
--- a/hosts/iroha/libvirt/qemu/corpa.xml
+++ b/hosts/iroha/libvirt/qemu/corpa.xml
@@ -15,11 +15,7 @@ or other application using the libvirt API.
   </metadata>
   <memory unit='KiB'>16777216</memory>
   <currentMemory unit='KiB'>16777216</currentMemory>
-  <memoryBacking>
-    <source type='memfd'/>
-    <access mode='shared'/>
-  </memoryBacking>
-  <vcpu placement='static'>6</vcpu>
+  <vcpu placement='static'>12</vcpu>
   <iothreads>1</iothreads>
   <cputune>
     <vcpupin vcpu='0' cpuset='0'/>
@@ -28,6 +24,12 @@ or other application using the libvirt API.
     <vcpupin vcpu='3' cpuset='13'/>
     <vcpupin vcpu='4' cpuset='2'/>
     <vcpupin vcpu='5' cpuset='14'/>
+    <vcpupin vcpu='6' cpuset='3'/>
+    <vcpupin vcpu='7' cpuset='15'/>
+    <vcpupin vcpu='8' cpuset='4'/>
+    <vcpupin vcpu='9' cpuset='16'/>
+    <vcpupin vcpu='10' cpuset='5'/>
+    <vcpupin vcpu='11' cpuset='17'/>
     <emulatorpin cpuset='6,18'/>
     <iothreadpin iothread='1' cpuset='7,19'/>
   </cputune>
@@ -54,7 +56,7 @@ or other application using the libvirt API.
     <msrs unknown='ignore'/>
   </features>
   <cpu mode='host-passthrough' check='none' migratable='off'>
-    <topology sockets='1' dies='1' clusters='1' cores='3' threads='2'/>
+    <topology sockets='1' dies='1' clusters='1' cores='6' threads='2'/>
     <cache mode='passthrough'/>
     <feature policy='require' name='topoext'/>
     <feature policy='require' name='hypervisor'/>
@@ -182,13 +184,6 @@ or other application using the libvirt API.
     <controller type='virtio-serial' index='0'>
       <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
     </controller>
-    <filesystem type='mount' accessmode='passthrough'>
-      <driver type='virtiofs' queue='1024'/>
-      <binary path='/usr/libexec/virtiofsd' xattr='on'/>
-      <source dir='/mnt/hdd/Roms'/>
-      <target dir='HostMountA'/>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </filesystem>
     <interface type='bridge'>
       <mac address='52:54:00:c6:ef:20'/>
       <source bridge='virbr0'/>
diff --git a/hosts/iroha/libvirt/qemu/xp.xml b/hosts/iroha/libvirt/qemu/xp.xml
index 7572311..05f69fc 100644
--- a/hosts/iroha/libvirt/qemu/xp.xml
+++ b/hosts/iroha/libvirt/qemu/xp.xml
@@ -13,12 +13,8 @@ or other application using the libvirt API.
       <libosinfo:os id="http://microsoft.com/win/xp"/>
     </libosinfo:libosinfo>
   </metadata>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <memoryBacking>
-    <source type='memfd'/>
-    <access mode='shared'/>
-  </memoryBacking>
+  <memory unit='KiB'>2097152</memory>
+  <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc-i440fx-9.2'>hvm</type>
@@ -66,7 +62,7 @@ or other application using the libvirt API.
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
-      <source file='/home/andrew/isos/virtio-win-0.1.266.iso'/>
+      <source file='/home/andrew/isos/virtio-win-0.1.271.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
@@ -116,7 +112,7 @@ or other application using the libvirt API.
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='0.0.0.0'>
+    <graphics type='spice' port='5900' autoport='no' listen='0.0.0.0'>
       <listen type='address' address='0.0.0.0'/>
       <gl enable='no'/>
     </graphics>
-- 
cgit v1.2.3-101-g0448