guest: Add back spice virtio-serial for windows

This was removed in v2.0.0, but we've had some complains since then

https://bugzilla.redhat.com/show_bug.cgi?id=1660123

tests/cli-test-xml/compare/virt-convert-ovf-compare.xml

@@ -52,6 +52,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-convert-vmx-compare.xml

@@ -50,6 +50,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-boot-uefi.xml

@@ -43,6 +43,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml

@@ -64,6 +64,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
@@ -141,6 +144,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml

@@ -44,6 +44,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
@@ -100,6 +103,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml

@@ -53,6 +53,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
     </graphics>
@@ -117,6 +120,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
     </graphics>

tests/cli-test-xml/compare/virt-install-kvm-win10.xml

@@ -56,6 +56,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
@@ -124,6 +127,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml

@@ -56,6 +56,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
@@ -124,6 +127,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml

@@ -49,6 +49,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
@@ -108,6 +111,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml

@@ -51,6 +51,9 @@
       <model type="pcnet"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
     </graphics>

tests/cli-test-xml/compare/virt-install-osvariant-defaults-pxe.xml

@@ -45,6 +45,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
@@ -102,6 +105,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-q35-defaults.xml

@@ -54,6 +54,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
@@ -118,6 +121,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-qemu-plain.xml

@@ -48,6 +48,9 @@
       <model type="virtio"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-win7-uefi.xml

@@ -61,6 +61,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>
@@ -134,6 +137,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml

@@ -42,6 +42,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml

@@ -42,6 +42,9 @@
       <model type="e1000e"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt

@@ -46,6 +46,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt

@@ -52,6 +52,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2

@@ -52,6 +52,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt

@@ -47,6 +47,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt

@@ -46,6 +46,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw

@@ -46,6 +46,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt

@@ -45,6 +45,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt

@@ -51,6 +51,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt

@@ -50,6 +50,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw

@@ -50,6 +50,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt

@@ -50,6 +50,9 @@
       <model type="e1000"/>
     </interface>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/xmlparse-xml/replace-child-build.xml

@@ -50,6 +50,9 @@
       <master startport="4"/>
     </controller>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

tests/xmlparse-xml/replace-child-parse.xml

@@ -49,6 +49,9 @@
       <master startport="4"/>
     </controller>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <input type="tablet" bus="usb"/>
     <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
       <image compression="off"/>

virtinst/guest.py

@@ -960,9 +960,11 @@ class Guest(XMLBuilder):
         for chn in self.devices.channel:
             if chn.type == chn.TYPE_SPICEVMC:
                 return
-        if not self._supports_virtioserial():
-            return
 
+        # We explicitly don't check for virtioserial support here.
+        # We did that for a while, which excluded windows, and
+        # we received some complaints.
+        # https://bugzilla.redhat.com/show_bug.cgi?id=1660123
         dev = DeviceChannel(self.conn)
         dev.type = DeviceChannel.TYPE_SPICEVMC
         dev.set_defaults(self)