doc: remove reference to SDL from virt-install man page

Adjust some tests to not use --graphics sdl. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2014-02-06 12:12:12 +01:00 · 2014-02-06 12:12:12 +01:00 · 499cb63f65
parent 3be9dd3eb3
commit 499cb63f65
78 changed files with 83 additions and 104 deletions
--- a/man/virt-install.pod
+++ b/man/virt-install.pod
@ -768,12 +768,6 @@ actual VNC display allocated can be obtained using the C<vncdisplay>
 command to C<virsh> (or L<virt-viewer(1)> can be used which handles this
 detail for the use).

-sdl
-
-Setup a virtual console in the guest and display an SDL window in the
-host to render the output. If the SDL window is closed the guest may
-be unconditionally terminated.
-
 spice

 Export the guest's console using the Spice protocol. Spice allows advanced
@ -1442,20 +1436,6 @@ booting from PXE, using VNC server/viewer
       --graphics vnc \
       --os-variant fedora9

-Install a guest with a real partition, with the default QEMU hypervisor for
-a different architecture using SDL graphics, using a remote kernel and initrd
-pair:
-
-  # virt-install \
-       --connect qemu:///system \
-       --name demo \
-       --memory 500 \
-       --disk path=/dev/hdc \
-       --network bridge=eth1 \
-       --arch ppc64 \
-       --graphics sdl \
-       --location http://download.fedora.redhat.com/pub/fedora/linux/core/6/x86_64/os/
-
 Run a Live CD image under Xen fullyvirt, in diskless environment

  # virt-install \
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-graphics.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-graphics.xml
@ -1,11 +1,11 @@
       </backend>
     </tpm>
     <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/testdir/.Xauthority" fullscreen="yes"/>
-+    <graphics type="sdl" display=":3.4" xauth="/testdir/.Xauthority" fullscreen="yes" tlsPort="5902" keymap="ja"/>
+-    <graphics type="vnc" fullscreen="yes"/>
+    <graphics type="vnc" fullscreen="yes" tlsPort="5902" keymap="ja"/>
     <graphics type="vnc" port="-1" autoport="yes"/>
     <graphics type="vnc" port="-1" autoport="yes" listen="1.2.3.4" keymap="fi">
       <listen type="address" address="1.2.3.4"/>

 Domain 'test-many-devices' defined successfully.
-Changes will take effect after the next domain shutdown.
+Changes will take effect after the next domain shutdown.
--- a/tests/clitest.py
+++ b/tests/clitest.py
@ -1,4 +1,4 @@
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013, 2014 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/tests/image-xml/image2guest/image-format-out.xml
+++ b/tests/image-xml/image2guest/image-format-out.xml
@ -34,7 +34,7 @@
      <target dev="hdc" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/image-xml/image2guest/image-xenfv32.xml
+++ b/tests/image-xml/image2guest/image-xenfv32.xml
@ -32,7 +32,7 @@
      <target dev="hdd" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/test_inject.py
+++ b/tests/test_inject.py
@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013, 2014 Red Hat, Inc.

 import atexit
 import os
@ -107,7 +107,7 @@ def _test_distro(distro):
    append = "-append \"ks=file:/%s\"" % os.path.basename(injectfile)
    print os.environ["DISPLAY"]
    cmd = ("sudo qemu-kvm -enable-kvm -name %s "
-           "-cpu host -m 1500 -sdl "
+           "-cpu host -m 1500 -vnc "
           "-net bridge,br=virbr0 -net nic,model=%s "
           "-kernel %s -initrd %s %s" %
           (distro.name, nic, kernel, newinitrd, append))
--- a/tests/testdriver.xml
+++ b/tests/testdriver.xml
@ -209,7 +209,7 @@


    <!-- Graphics devices -->
-    <graphics type='sdl' display=':3.4' xauth='/testdir/.Xauthority' fullscreen='yes'/>
+    <graphics type='vnc' display=':3.4' xauth='/testdir/.Xauthority' fullscreen='yes'/>
    <graphics type='vnc'/>
    <graphics type='vnc' listen="1.2.3.4" keymap="fi"/>
    <graphics type='vnc' port="5903" passwd="foobar"/>
--- a/tests/utils.py
+++ b/tests/utils.py
@ -1,4 +1,4 @@
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013, 2014 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -253,9 +253,8 @@ def get_basic_fullyvirt_guest(typ="xen", installer=None):
    g.installer.location = "/dev/null"
    g.installer.cdrom = True
    gdev = VirtualGraphics(_conn)
-    gdev.type = "sdl"
-    gdev.display = ":3.4"
-    gdev.xauth = "/tmp/.Xauthority"
+    gdev.type = "vnc"
+    gdev.keymap = "ja"
    g.add_device(gdev)
    g.features.pae = False
    g.vcpus = 5
--- a/tests/xmlconfig-xml/boot-cpuset.xml
+++ b/tests/xmlconfig-xml/boot-cpuset.xml
@ -31,7 +31,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml
+++ b/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml
@ -28,7 +28,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
+++ b/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
@ -28,7 +28,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml
+++ b/tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml
@ -25,7 +25,7 @@
      <target dev="hda" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml
+++ b/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml
@ -20,7 +20,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
+++ b/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
@ -24,7 +24,7 @@
      <target dev="hda" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-many-chars.xml
+++ b/tests/xmlconfig-xml/boot-many-chars.xml
@ -20,7 +20,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <serial type="null"/>
    <serial type="tcp">
      <source mode="bind" host="my.source.host" service="1234"/>
--- a/tests/xmlconfig-xml/boot-many-devices.xml
+++ b/tests/xmlconfig-xml/boot-many-devices.xml
@ -61,7 +61,7 @@
      <address type="spapr-vio"/>
    </interface>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <graphics type="vnc" port="-1" keymap="en-us"/>
    <graphics type="vnc" port="-1"/>
    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
--- a/tests/xmlconfig-xml/boot-many-disks2.xml
+++ b/tests/xmlconfig-xml/boot-many-disks2.xml
@ -66,7 +66,7 @@
      <target dev="vda" bus="virtio"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-many-hostdevs.xml
+++ b/tests/xmlconfig-xml/boot-many-hostdevs.xml
@ -20,7 +20,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <hostdev mode="subsystem" type="usb" managed="yes">
      <source>
--- a/tests/xmlconfig-xml/boot-many-nics.xml
+++ b/tests/xmlconfig-xml/boot-many-nics.xml
@ -41,7 +41,7 @@
      <mac address="00:11:00:22:00:33"/>
    </interface>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-many-sounds.xml
+++ b/tests/xmlconfig-xml/boot-many-sounds.xml
@ -20,7 +20,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="sb16"/>
    <sound model="es1370"/>
--- a/tests/xmlconfig-xml/boot-usb2.xml
+++ b/tests/xmlconfig-xml/boot-usb2.xml
@ -30,7 +30,7 @@
      <master startport="4"/>
    </controller>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml
+++ b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml
@ -38,7 +38,7 @@
      <mac address='22:22:33:44:55:66'/>
    </interface>
    <input type='tablet' bus='usb'/>
-    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
    <console type='pty'/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-f10.xml
+++ b/tests/xmlconfig-xml/install-f10.xml
@ -39,7 +39,7 @@
      <model type="virtio"/>
    </interface>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-f11-ac97.xml
+++ b/tests/xmlconfig-xml/install-f11-ac97.xml
@ -47,7 +47,7 @@
      <model type="virtio"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="ac97"/>
  </devices>
--- a/tests/xmlconfig-xml/install-f11-noac97.xml
+++ b/tests/xmlconfig-xml/install-f11-noac97.xml
@ -43,7 +43,7 @@
      <model type="virtio"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="es1370"/>
  </devices>
--- a/tests/xmlconfig-xml/install-f11-norheldefaults.xml
+++ b/tests/xmlconfig-xml/install-f11-norheldefaults.xml
@ -47,7 +47,7 @@
      <model type="virtio"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="ac97"/>
  </devices>
--- a/tests/xmlconfig-xml/install-f11-qemu.xml
+++ b/tests/xmlconfig-xml/install-f11-qemu.xml
@ -47,7 +47,7 @@
      <model type="virtio"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-f11-rheldefaults.xml
+++ b/tests/xmlconfig-xml/install-f11-rheldefaults.xml
@ -47,7 +47,7 @@
      <model type="virtio"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="ac97"/>
  </devices>
--- a/tests/xmlconfig-xml/install-f11-xen.xml
+++ b/tests/xmlconfig-xml/install-f11-xen.xml
@ -40,7 +40,7 @@
      <mac address="22:22:33:44:55:66"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-f11.xml
+++ b/tests/xmlconfig-xml/install-f11.xml
@ -47,7 +47,7 @@
      <model type="virtio"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml
+++ b/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml
@ -30,7 +30,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
+++ b/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
@ -30,7 +30,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml
+++ b/tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml
@ -26,7 +26,7 @@
      <target dev="hda" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml
+++ b/tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml
@ -28,7 +28,7 @@
      <target dev="hda" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-fullyvirt-import.xml
+++ b/tests/xmlconfig-xml/install-fullyvirt-import.xml
@ -24,7 +24,7 @@
      <target dev="hda" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-fullyvirt-livecd.xml
+++ b/tests/xmlconfig-xml/install-fullyvirt-livecd.xml
@ -25,7 +25,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml
+++ b/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml
@ -20,7 +20,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-fullyvirt-pxe.xml
+++ b/tests/xmlconfig-xml/install-fullyvirt-pxe.xml
@ -25,7 +25,7 @@
      <target dev="hda" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-kvm-keymap-local.xml
+++ b/tests/xmlconfig-xml/install-kvm-keymap-local.xml
@ -32,7 +32,7 @@
      <model type='virtio'/>
    </interface>
    <input type='tablet' bus='usb'/>
-    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
    <console type='pty'/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-kvm-keymap-none.xml
+++ b/tests/xmlconfig-xml/install-kvm-keymap-none.xml
@ -32,7 +32,7 @@
      <model type='virtio'/>
    </interface>
    <input type='tablet' bus='usb'/>
-    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
    <console type='pty'/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/install-windowsxp-kvm.xml
+++ b/tests/xmlconfig-xml/install-windowsxp-kvm.xml
@ -39,7 +39,7 @@
      <mac address='22:22:33:44:55:66'/>
    </interface>
    <input type='tablet' bus='usb'/>
-    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
    <console type='pty'/>
    <sound model='es1370'/>
    <video>
--- a/tests/xmlconfig-xml/install-windowsxp-xennew.xml
+++ b/tests/xmlconfig-xml/install-windowsxp-xennew.xml
@ -38,7 +38,7 @@
      <mac address="22:22:33:44:55:66"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="es1370"/>
  </devices>
--- a/tests/xmlconfig-xml/install-windowsxp-xenold.xml
+++ b/tests/xmlconfig-xml/install-windowsxp-xenold.xml
@ -34,7 +34,7 @@
      <mac address="22:22:33:44:55:66"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="es1370"/>
  </devices>
--- a/tests/xmlconfig-xml/misc-qemu-driver-name.xml
+++ b/tests/xmlconfig-xml/misc-qemu-driver-name.xml
@ -36,7 +36,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
+++ b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
@ -36,7 +36,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/misc-qemu-driver-type.xml
+++ b/tests/xmlconfig-xml/misc-qemu-driver-type.xml
@ -41,7 +41,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
+++ b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
@ -36,7 +36,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/misc-xml-escaping.xml
+++ b/tests/xmlconfig-xml/misc-xml-escaping.xml
@ -33,7 +33,7 @@
      <readonly/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml
+++ b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml
@ -45,7 +45,7 @@
      <model type="virtio"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="ich6"/>
    <video>
--- a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml
+++ b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml
@ -43,7 +43,7 @@
      <model type="virtio"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="ich6"/>
    <video>
--- a/tests/xmlconfig-xml/winxp-kvm-stage1.xml
+++ b/tests/xmlconfig-xml/winxp-kvm-stage1.xml
@ -44,7 +44,7 @@
      <mac address="22:22:33:44:55:66"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="ich6"/>
    <video>
--- a/tests/xmlconfig-xml/winxp-kvm-stage2.xml
+++ b/tests/xmlconfig-xml/winxp-kvm-stage2.xml
@ -43,7 +43,7 @@
      <mac address="22:22:33:44:55:66"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="ich6"/>
    <video>
--- a/tests/xmlconfig-xml/winxp-kvm-stage3.xml
+++ b/tests/xmlconfig-xml/winxp-kvm-stage3.xml
@ -43,7 +43,7 @@
      <mac address="22:22:33:44:55:66"/>
    </interface>
    <input type="tablet" bus="usb"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" port="-1" keymap="ja"/>
    <console type="pty"/>
    <sound model="ich6"/>
    <video>
--- a/tests/xmlparse-xml/add-devices-in.xml
+++ b/tests/xmlparse-xml/add-devices-in.xml
@ -41,7 +41,7 @@
      <mac address="22:22:33:44:55:66"/>
      <model type="virtio"/>
    </interface>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
  </devices>
  <seclabel type="static" model="selinux">
--- a/tests/xmlparse-xml/add-devices-out.xml
+++ b/tests/xmlparse-xml/add-devices-out.xml
@ -36,7 +36,7 @@
      <mac address="22:22:33:44:55:66"/>
      <model type="virtio"/>
    </interface>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <sound model="pcspk"/>
    <interface type="network">
--- a/tests/xmlparse-xml/change-boot-multi-in.xml
+++ b/tests/xmlparse-xml/change-boot-multi-in.xml
@ -27,7 +27,7 @@
      <target dev="hda" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlparse-xml/change-boot-multi-out.xml
+++ b/tests/xmlparse-xml/change-boot-multi-out.xml
@ -28,7 +28,7 @@
      <target dev="hda" bus="ide"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlparse-xml/change-chars-in.xml
+++ b/tests/xmlparse-xml/change-chars-in.xml
@ -19,7 +19,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <serial type="null"/>
    <serial type="tcp">
      <source mode="bind" host="my.source.host" service="1234"/>
--- a/tests/xmlparse-xml/change-chars-out.xml
+++ b/tests/xmlparse-xml/change-chars-out.xml
@ -19,7 +19,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <serial type="udp">
      <source mode="bind" host="example.com" service="66"/>
      <source mode="connect" host="example.com.uk" service="77"/>
--- a/tests/xmlparse-xml/change-disk-in.xml
+++ b/tests/xmlparse-xml/change-disk-in.xml
@ -63,7 +63,7 @@
      <target dev="vda" bus="virtio"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlparse-xml/change-disk-out.xml
+++ b/tests/xmlparse-xml/change-disk-out.xml
@ -65,7 +65,7 @@
      <target dev="vda" bus="virtio"/>
    </disk>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlparse-xml/change-graphics-in.xml
+++ b/tests/xmlparse-xml/change-graphics-in.xml
@ -24,7 +24,7 @@
      <target dev="fda" bus="fdc"/>
    </disk>
    <graphics type="vnc" passwd="foobar" port="100" listen="0.0.0.0"/>
-    <graphics type="sdl" xauth="/tmp/.Xauthority" display="1:2"/>
+    <graphics type="vnc" xauth="/tmp/.Xauthority" display="1:2"/>
    <graphics type="rdp" listen='1.1.2.3'>
      <listen type='address' address='1.1.2.3'/>
    </graphics>
--- a/tests/xmlparse-xml/change-graphics-out.xml
+++ b/tests/xmlparse-xml/change-graphics-out.xml
@ -24,7 +24,7 @@
      <target dev="fda" bus="fdc"/>
    </disk>
    <graphics type="vnc" passwd="newpass" port="6000" listen="1.2.3.4" keymap="en-us"/>
-    <graphics type="sdl" xauth="fooauth" display="6:1"/>
+    <graphics type="vnc" xauth="fooauth" display="6:1"/>
    <graphics type="vnc">
    </graphics>
    <graphics type="vnc" port="-1" socket="/var/lib/libvirt/socket/foo"/>
--- a/tests/xmlparse-xml/change-guest-in.xml
+++ b/tests/xmlparse-xml/change-guest-in.xml
@ -63,7 +63,7 @@
      <mac address="22:22:33:44:55:66"/>
      <model type="virtio"/>
    </interface>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <memballoon model='virtio'/>
  </devices>
--- a/tests/xmlparse-xml/change-guest-out.xml
+++ b/tests/xmlparse-xml/change-guest-out.xml
@ -68,7 +68,7 @@
      <mac address="22:22:33:44:55:66"/>
      <model type="virtio"/>
    </interface>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <memballoon model="none"/>
  </devices>
--- a/tests/xmlparse-xml/change-hostdevs-in.xml
+++ b/tests/xmlparse-xml/change-hostdevs-in.xml
@ -19,7 +19,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <hostdev mode="subsystem" type="usb" managed="yes">
      <source>
--- a/tests/xmlparse-xml/change-hostdevs-out.xml
+++ b/tests/xmlparse-xml/change-hostdevs-out.xml
@ -19,7 +19,7 @@
  <devices>
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <hostdev type="usb" managed="no">
      <source>
--- a/tests/xmlparse-xml/change-nics-in.xml
+++ b/tests/xmlparse-xml/change-nics-in.xml
@ -45,7 +45,7 @@
      <address type="pci" domain="0x0000" bus="0x00" slot="0x07" function="0x0"/>
    </interface>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlparse-xml/change-nics-out.xml
+++ b/tests/xmlparse-xml/change-nics-out.xml
@ -48,7 +48,7 @@
      <driver name="vhost" queues="5"/>
    </interface>
    <input type="mouse" bus="ps2"/>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
  </devices>
 </domain>
--- a/tests/xmlparse-xml/change-rng-egd-in.xml
+++ b/tests/xmlparse-xml/change-rng-egd-in.xml
@ -48,7 +48,7 @@
      <mac address='22:22:33:44:55:66'/>
      <model type='virtio'/>
    </interface>
-    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
    <console type='pty'/>
    <rng model='virtio'>
      <rate period='2000' bytes='1234'/>
--- a/tests/xmlparse-xml/change-rng-egd-out.xml
+++ b/tests/xmlparse-xml/change-rng-egd-out.xml
@ -48,7 +48,7 @@
      <mac address="22:22:33:44:55:66"/>
      <model type="virtio"/>
    </interface>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <rng model="virtio">
      <rate period="2001" bytes="4321"/>
--- a/tests/xmlparse-xml/change-rng-random-in.xml
+++ b/tests/xmlparse-xml/change-rng-random-in.xml
@ -48,7 +48,7 @@
      <mac address='22:22:33:44:55:66'/>
      <model type='virtio'/>
    </interface>
-    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
    <console type='pty'/>
    <rng model='virtio'>
      <backend model='random'>/dev/random</backend>
--- a/tests/xmlparse-xml/change-rng-random-out.xml
+++ b/tests/xmlparse-xml/change-rng-random-out.xml
@ -48,7 +48,7 @@
      <mac address="22:22:33:44:55:66"/>
      <model type="virtio"/>
    </interface>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <rng model="virtio">
      <backend model="random">/dev/hwrng</backend>
--- a/tests/xmlparse-xml/change-smartcard-in.xml
+++ b/tests/xmlparse-xml/change-smartcard-in.xml
@ -48,7 +48,7 @@
      <mac address='22:22:33:44:55:66'/>
      <model type='virtio'/>
    </interface>
-    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
    <console type='pty'/>
    <smartcard mode='host'>
    </smartcard>
--- a/tests/xmlparse-xml/change-smartcard-out.xml
+++ b/tests/xmlparse-xml/change-smartcard-out.xml
@ -48,7 +48,7 @@
      <mac address="22:22:33:44:55:66"/>
      <model type="virtio"/>
    </interface>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <smartcard mode="host" type="tcp">
    </smartcard>
--- a/tests/xmlparse-xml/change-tpm-in.xml
+++ b/tests/xmlparse-xml/change-tpm-in.xml
@ -48,7 +48,7 @@
      <mac address='22:22:33:44:55:66'/>
      <model type='virtio'/>
    </interface>
-    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <graphics type='vnc' display=':3.4' xauth='/tmp/.Xauthority'/>
    <console type='pty'/>
    <tpm model='tpm-tis'>
      <backend type='passthrough'>
--- a/tests/xmlparse-xml/change-tpm-out.xml
+++ b/tests/xmlparse-xml/change-tpm-out.xml
@ -48,7 +48,7 @@
      <mac address="22:22:33:44:55:66"/>
      <model type="virtio"/>
    </interface>
-    <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+    <graphics type="vnc" display=":3.4" xauth="/tmp/.Xauthority"/>
    <console type="pty"/>
    <tpm model="tpm-tis">
      <backend type="passthrough">
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@ -1,4 +1,4 @@
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013, 2014 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -508,7 +508,7 @@ class XMLParseTest(unittest.TestCase):
        check("keymap", None, "en-us")

        check = self._make_checker(dev2)
-        check("type", "sdl")
+        check("type", "vnc")
        check("xauth", "/tmp/.Xauthority", "fooauth")
        check("display", "1:2", "6:1")