Fix last remnants of default_graphics=vnc

tests/cli-test-xml/compare/kvm-f14-url.xml

@@ -59,10 +59,13 @@
       <model type="virtio"/>
     </interface>
     <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <video>
-      <model type="cirrus"/>
+      <model type="qxl"/>
     </video>
   </devices>
 </domain>
@@ -125,10 +128,13 @@
       <model type="virtio"/>
     </interface>
     <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <video>
-      <model type="cirrus"/>
+      <model type="qxl"/>
     </video>
   </devices>
 </domain>

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

@@ -37,11 +37,14 @@
       <mac address="00:11:22:33:44:55"/>
     </interface>
     <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <sound model="ich6"/>
     <video>
-      <model type="vga"/>
+      <model type="qxl"/>
     </video>
   </devices>
 </domain>
@@ -83,11 +86,14 @@
       <mac address="00:11:22:33:44:55"/>
     </interface>
     <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <sound model="ich6"/>
     <video>
-      <model type="vga"/>
+      <model type="qxl"/>
     </video>
   </devices>
 </domain>
@@ -129,11 +135,14 @@
       <mac address="00:11:22:33:44:55"/>
     </interface>
     <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <sound model="ich6"/>
     <video>
-      <model type="vga"/>
+      <model type="qxl"/>
     </video>
   </devices>
 </domain>

tests/cli-test-xml/compare/kvm-xenner.xml

@@ -24,9 +24,12 @@
       <mac address="00:11:22:33:44:55"/>
     </interface>
     <input type="mouse" bus="xen"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <video>
-      <model type="cirrus"/>
+      <model type="qxl"/>
     </video>
   </devices>
 </domain>

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

@@ -38,10 +38,13 @@
       <model type="virtio"/>
     </interface>
     <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
     <console type="pty"/>
+    <channel type="spicevmc">
+      <target type="virtio" name="com.redhat.spice.0"/>
+    </channel>
     <video>
-      <model type="cirrus"/>
+      <model type="qxl"/>
     </video>
   </devices>
 </domain>

virt-manager.spec.in

@@ -8,7 +8,6 @@
 %define libvirt_packages           "libvirt-daemon-kvm,libvirt-daemon-config-network"
 %define preferred_distros          "fedora,rhel"
 %define kvm_packages               "qemu-system-x86"
-%define default_graphics           "spice"
 
 %if 0%{?rhel}
 %define preferred_distros          "rhel,fedora"
@@ -129,10 +128,6 @@ machine).
 %define _disable_unsupported_rhel --hide-unsupported-rhel-options
 %endif
 
-%if %{default_graphics}
-%define _default_graphics --default-graphics=%{default_graphics}
-%endif
-
 python setup.py configure \
     --pkgversion="%{version}" \
     %{?_qemu_user} \
@@ -140,8 +135,7 @@ python setup.py configure \
     %{?_libvirt_packages} \
     %{?_askpass_package} \
     %{?_preferred_distros} \
-    %{?_disable_unsupported_rhel} \
-    %{?_default_graphics}
+    %{?_disable_unsupported_rhel}
 
 
 %install

virtcli/cliconfig.py

@@ -85,4 +85,4 @@ preferred_distros = _split_list(_get_param("preferred_distros", ""))
 hv_packages = _split_list(_get_param("hv_packages", ""))
 askpass_package = _split_list(_get_param("askpass_packages", ""))
 libvirt_packages = _split_list(_get_param("libvirt_packages", ""))
-default_graphics = _get_param("default_graphics", "vnc")
+default_graphics = _get_param("default_graphics", "spice")