remove extra clock, host-model CPU

session/linux515.xml

@@ -21,14 +21,14 @@
     <topology sockets="1" dies="1" cores="2" threads="2"/>
   </cpu>
   <clock offset='utc'>
-    <timer name='kvmclock' tickpolicy='catchup'/>
+    <timer name='kvmclock'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
+    <suspend-to-mem enabled='yes'/>
+    <suspend-to-disk enabled='yes'/>
   </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
@@ -41,7 +41,6 @@
     <controller type='virtio-serial' index='0'>
       <model type='virtio-non-transitional'/>
     </controller>
-    <smartcard mode='host'/>
     <interface type='user'>
       <backend type='passt'/>
       <model type='virtio'/>
@@ -60,9 +59,10 @@
     <tpm model="tpm-crb">
       <backend type="emulator" version="2.0"/>
     </tpm>
-    <graphics type="dbus">
+    <graphics type="spice">
+      <listen type="none"/>
+      <image compression="off"/>
       <gl enable="yes"/>
-      <audio id="1"/>
     </graphics>
     <video>
       <model type="virtio" heads="1" primary="yes">
@@ -80,9 +80,6 @@
       <target dir="mnt"/>
       <readonly/>
     </filesystem>
-    <vsock model="virtio-non-transitional">
-      <cid auto="yes"/>
-    </vsock>
     <iommu model="virtio"/>
   </devices>
 </domain>

session/linux54.xml

@@ -5,30 +5,31 @@
   <memory unit="KiB">4194304</memory>
   <currentMemory unit="KiB">1048576</currentMemory>
   <vcpu placement='static'>4</vcpu>
-  <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
-    <loader readonly='yes' secure='no' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>    
-    <boot dev='cdrom'/>
+  <memoryBacking>
+    <source type="memfd"/>
+    <access mode="shared"/>
+  </memoryBacking>
+  <os firmware="efi">
+    <type arch="x86_64" machine="q35">hvm</type>
+    <loader secure='no'/>
+    <boot dev="cdrom"/>
   </os>
   <features>
     <acpi/>
     <apic/>
-    <vmport state='off'/>
   </features>
-  <cpu mode="host-passthrough" check="none" migratable="on">
+  <cpu mode="host-model">
     <topology sockets="1" dies="1" cores="2" threads="2"/>
   </cpu>
   <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
+    <timer name='kvmclock'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
+    <suspend-to-mem enabled='yes'/>
+    <suspend-to-disk enabled='yes'/>
   </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

system/linux515.xml

@@ -17,15 +17,12 @@
   <features>
     <acpi/>
     <apic/>
-    <vmport state='off'/>
   </features>
-  <cpu mode="host-passthrough" check="none" migratable="on">
+  <cpu mode="host-model">
     <topology sockets="1" dies="1" cores="2" threads="2"/>
   </cpu>
   <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
+    <timer name='kvmclock'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>

system/linux54.xml

@@ -9,23 +9,20 @@
     <access mode="shared"/>
   </memoryBacking>
   <vcpu placement='static'>4</vcpu>
-  <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
-    <loader readonly='yes' secure='no' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>    
-    <boot dev='cdrom'/>
+  <os firmware="efi">
+    <type arch="x86_64" machine="q35">hvm</type>
+    <loader secure='no'/>
+    <boot dev="cdrom"/>
   </os>
   <features>
     <acpi/>
     <apic/>
-    <vmport state='off'/>
   </features>
-  <cpu mode="host-passthrough" check="none" migratable="on">
+  <cpu mode="host-model">
     <topology sockets="1" dies="1" cores="2" threads="2"/>
   </cpu>
   <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
+    <timer name='kvmclock'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>

system/windows10.xml

@@ -8,10 +8,10 @@
     <access mode="shared"/>
   </memoryBacking>
   <vcpu placement='static'>4</vcpu>
-  <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
-    <loader readonly='yes' secure='no' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>    
-    <boot dev='cdrom'/>
+  <os firmware="efi">
+    <type arch="x86_64" machine="q35">hvm</type>
+    <loader secure='no'/>
+    <boot dev="cdrom"/>
   </os>
   <features>
   <acpi/>
@@ -37,15 +37,11 @@
   <kvm>
     <hidden state='on'/>
   </kvm>
-  <vmport state="off"/>
   </features>
-  <cpu mode="host-passthrough" check="none" migratable="on">
+  <cpu mode="host-model">
     <topology sockets="1" dies="1" cores="2" threads="2"/>
   </cpu>
   <clock offset="localtime">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
     <timer name="hypervclock" present="yes"/>
   </clock>
   <on_poweroff>destroy</on_poweroff>

system/windows11.xml

@@ -37,15 +37,11 @@
   <kvm>
     <hidden state="on"/>
   </kvm>
-  <vmport state="off"/>
   </features>
-  <cpu mode="host-passthrough" check="none" migratable="on">
+  <cpu mode="host-model">
     <topology sockets="1" dies="1" cores="2" threads="2"/>
   </cpu>
   <clock offset="localtime">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
     <timer name="hypervclock" present="yes"/>
   </clock>
   <on_poweroff>destroy</on_poweroff>