daily autocommit

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 9dd7b8204ec8767113441d3b6197436a00cebf26..3d307cb88c72f3bd714f632f7231d4887ade3aa1 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,7 +1,7 @@
 # Printer configuration file for CUPS v2.3.1
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-NextPrinterId 101
+NextPrinterId 102
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -97,27 +97,6 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer hp_LaserJet_9040_8BFB3E_>
-PrinterId 99
-UUID urn:uuid:a92c50e2-5eb3-3c19-5bbd-85acf844ae86
-Info 
-Location 
-MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
-DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/
-State Idle
-StateTime 1597298916
-ConfigTime 1597298916
-Type 8400988
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Option cups-browsed true
-</Printer>
 <Printer HP_LaserJet_M806_17B98C_>
 PrinterId 7
 UUID urn:uuid:b97fc042-5272-3bbc-7495-afb7cf437065

diff --git a/libvirt/qemu/win10.xml b/libvirt/qemu/win10.xml
index 024c61a35e35be48478ca15013601ee08b63eb9b..0cbb5c583aabba6079bc6e8f006ac401dc440e93 100644 (file)
--- a/libvirt/qemu/win10.xml
+++ b/libvirt/qemu/win10.xml
@@ -15,7 +15,7 @@ or other application using the libvirt API.
   </metadata>
   <memory unit='KiB'>4194304</memory>
   <currentMemory unit='KiB'>4194304</currentMemory>
-  <vcpu placement='static'>4</vcpu>
+  <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc-q35-4.2'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.ms.fd</loader>
@@ -54,12 +54,6 @@ or other application using the libvirt API.
       <target dev='vda' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
     </disk>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/var/lib/libvirt/images/win10-1.qcow2'/>
-      <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/virtio-win-0.1.173.iso'/>
@@ -143,7 +137,7 @@ or other application using the libvirt API.
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
     </sound>
     <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <model type='qxl' ram='65536' vram='65536' vgamem='65536' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <redirdev bus='usb' type='spicevmc'>