Adjust some tests to not use --graphics sdl.
Signed-off-by: Giuseppe Scrivano <gscrivan@xxxxxxxxxx>
---
man/virt-install.pod | 20 --------------------
tests/cli-test-xml/compare/qemu-sparc.xml | 2 +-
.../compare/virtxml-edit-simple-graphics.xml | 6 +++---
tests/clitest.py | 4 ++--
tests/image-xml/image2guest/image-format-out.xml | 2 +-
tests/image-xml/image2guest/image-xenfv32.xml | 2 +-
tests/test_inject.py | 4 ++--
tests/testdriver.xml | 2 +-
tests/utils.py | 7 +++----
tests/xmlconfig-xml/boot-cpuset.xml | 2 +-
tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml | 2 +-
tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml | 2 +-
tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml | 2 +-
tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml | 2 +-
tests/xmlconfig-xml/boot-fullyvirt-pxe.xml | 2 +-
tests/xmlconfig-xml/boot-many-chars.xml | 2 +-
tests/xmlconfig-xml/boot-many-devices.xml | 2 +-
tests/xmlconfig-xml/boot-many-disks2.xml | 2 +-
tests/xmlconfig-xml/boot-many-hostdevs.xml | 2 +-
tests/xmlconfig-xml/boot-many-nics.xml | 2 +-
tests/xmlconfig-xml/boot-many-sounds.xml | 2 +-
tests/xmlconfig-xml/boot-usb2.xml | 2 +-
tests/xmlconfig-xml/boot-windowsxp-kvm.xml | 2 +-
tests/xmlconfig-xml/install-f10.xml | 2 +-
tests/xmlconfig-xml/install-f11-ac97.xml | 2 +-
tests/xmlconfig-xml/install-f11-noac97.xml | 2 +-
tests/xmlconfig-xml/install-f11-norheldefaults.xml | 2 +-
tests/xmlconfig-xml/install-f11-qemu.xml | 2 +-
tests/xmlconfig-xml/install-f11-rheldefaults.xml | 2 +-
tests/xmlconfig-xml/install-f11-xen.xml | 2 +-
tests/xmlconfig-xml/install-f11.xml | 2 +-
tests/xmlconfig-xml/install-fullyvirt-disk-block.xml | 2 +-
tests/xmlconfig-xml/install-fullyvirt-disk-file.xml | 2 +-
.../install-fullyvirt-import-kernel.xml | 2 +-
.../install-fullyvirt-import-multiboot.xml | 2 +-
tests/xmlconfig-xml/install-fullyvirt-import.xml | 2 +-
tests/xmlconfig-xml/install-fullyvirt-livecd.xml | 2 +-
.../xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml | 2 +-
tests/xmlconfig-xml/install-fullyvirt-pxe.xml | 2 +-
tests/xmlconfig-xml/install-kvm-keymap-local.xml | 2 +-
tests/xmlconfig-xml/install-kvm-keymap-none.xml | 2 +-
tests/xmlconfig-xml/install-windowsxp-kvm.xml | 2 +-
tests/xmlconfig-xml/install-windowsxp-xennew.xml | 2 +-
tests/xmlconfig-xml/install-windowsxp-xenold.xml | 2 +-
tests/xmlconfig-xml/misc-qemu-driver-name.xml | 2 +-
tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml | 2 +-
tests/xmlconfig-xml/misc-qemu-driver-type.xml | 2 +-
tests/xmlconfig-xml/misc-qemu-iso-disk.xml | 2 +-
tests/xmlconfig-xml/misc-xml-escaping.xml | 2 +-
tests/xmlconfig-xml/rhel6-kvm-stage1.xml | 2 +-
tests/xmlconfig-xml/rhel6-kvm-stage2.xml | 2 +-
tests/xmlconfig-xml/winxp-kvm-stage1.xml | 2 +-
tests/xmlconfig-xml/winxp-kvm-stage2.xml | 2 +-
tests/xmlconfig-xml/winxp-kvm-stage3.xml | 2 +-
tests/xmlparse-xml/add-devices-in.xml | 2 +-
tests/xmlparse-xml/add-devices-out.xml | 2 +-
tests/xmlparse-xml/change-boot-multi-in.xml | 2 +-
tests/xmlparse-xml/change-boot-multi-out.xml | 2 +-
tests/xmlparse-xml/change-chars-in.xml | 2 +-
tests/xmlparse-xml/change-chars-out.xml | 2 +-
tests/xmlparse-xml/change-disk-in.xml | 2 +-
tests/xmlparse-xml/change-disk-out.xml | 2 +-
tests/xmlparse-xml/change-graphics-in.xml | 2 +-
tests/xmlparse-xml/change-graphics-out.xml | 2 +-
tests/xmlparse-xml/change-guest-in.xml | 2 +-
tests/xmlparse-xml/change-guest-out.xml | 2 +-
tests/xmlparse-xml/change-hostdevs-in.xml | 2 +-
tests/xmlparse-xml/change-hostdevs-out.xml | 2 +-
tests/xmlparse-xml/change-nics-in.xml | 2 +-
tests/xmlparse-xml/change-nics-out.xml | 2 +-
tests/xmlparse-xml/change-rng-egd-in.xml | 2 +-
tests/xmlparse-xml/change-rng-egd-out.xml | 2 +-
tests/xmlparse-xml/change-rng-random-in.xml | 2 +-
tests/xmlparse-xml/change-rng-random-out.xml | 2 +-
tests/xmlparse-xml/change-smartcard-in.xml | 2 +-
tests/xmlparse-xml/change-smartcard-out.xml | 2 +-
tests/xmlparse-xml/change-tpm-in.xml | 2 +-
tests/xmlparse-xml/change-tpm-out.xml | 2 +-
tests/xmlparse.py | 4 ++--
79 files changed, 85 insertions(+), 106 deletions(-)
diff --git a/man/virt-install.pod b/man/virt-install.pod
index 615fa8b..f600640 100644
--- a/man/virt-install.pod
+++ b/man/virt-install.pod
@@ -752,12 +752,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
@@ -1426,20 +1420,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 \
diff --git a/tests/cli-test-xml/compare/qemu-sparc.xml b/tests/cli-test-xml/compare/qemu-sparc.xml
index 1d91e21..0132e1a 100644
--- a/tests/cli-test-xml/compare/qemu-sparc.xml
+++ b/tests/cli-test-xml/compare/qemu-sparc.xml
@@ -23,7 +23,7 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
- <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
+ <graphics type="vnc" port="-1"/>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-graphics.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-graphics.xml
index 27617d6..50e8e2a 100644
--- 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.
\ No newline at end of file
+Changes will take effect after the next domain shutdown.
diff --git a/tests/clitest.py b/tests/clitest.py
index d264162..55f556b 100644
--- 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
@@ -527,7 +527,7 @@ c.add_compare("--os-variant fedora20 --nodisks --boot hd --paravirt", "kvm-xenne
c.add_compare("--os-variant fedora20 --nodisks --boot cdrom --virt-type qemu --cpu Penryn", "qemu-plain") # plain qemu
c.add_compare("--os-variant fedora20 --nodisks --boot network --nographics --arch i686", "qemu-32-on-64") # 32 on 64
c.add_compare("--os-variant fedora20 --nodisks --boot fd --graphics spice --machine pc", "kvm-machine") # kvm machine type 'pc'
-c.add_compare("--os-variant fedora20 --nodisks --boot fd --graphics sdl --arch sparc --machine SS-20", "qemu-sparc") # exotic arch + machine type
+c.add_compare("--os-variant fedora20 --nodisks --boot fd --graphics vnc --arch sparc --machine SS-20", "qemu-sparc") # exotic arch + machine type
c.add_compare("--arch armv7l --machine vexpress-a9 --boot kernel=/f19-arm.kernel,initrd=/f19-arm.initrd,dtb=/f19-arm.dtb,extra_args=\"console=ttyAMA0 rw root=/dev/mmcblk0p3\" --disk %(EXISTIMG1)s --nographics", "arm-vexpress-plain", skip_check=support.SUPPORT_CONN_DISK_SD)
c.add_compare("--arch armv7l --machine vexpress-a15 --boot kernel=/f19-arm.kernel,initrd=/f19-arm.initrd,dtb=/f19-arm.dtb,kernel_args=\"console=ttyAMA0 rw root=/dev/vda3\",extra_args=foo --disk %(EXISTIMG1)s --nographics --os-variant fedora19", "arm-vexpress-f19", skip_check=support.SUPPORT_CONN_VIRTIO_MMIO)
c.add_compare("--arch ppc64 --machine pseries --boot network --disk %(EXISTIMG1)s --os-variant fedora20", "ppc64-pseries-f20")
diff --git a/tests/image-xml/image2guest/image-format-out.xml b/tests/image-xml/image2guest/image-format-out.xml
index bdb3d69..150c1ff 100644
--- 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>
diff --git a/tests/image-xml/image2guest/image-xenfv32.xml b/tests/image-xml/image2guest/image-xenfv32.xml
index eed2cd0..0ea3b96 100644
--- 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>
diff --git a/tests/test_inject.py b/tests/test_inject.py
index a061a6c..3641b1d 100755
--- 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))
diff --git a/tests/testdriver.xml b/tests/testdriver.xml
index 1c3a737..c0c42ec 100644
--- a/tests/testdriver.xml
+++ b/tests/testdriver.xml
@@ -204,7 +204,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"/>
diff --git a/tests/utils.py b/tests/utils.py
index d15e276..976b66b 100644
--- 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
@@ -254,9 +254,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
diff --git a/tests/xmlconfig-xml/boot-cpuset.xml b/tests/xmlconfig-xml/boot-cpuset.xml
index 772cba0..70580fc 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml b/tests/xmlconfig-xml/boot-fullyvirt-disk-block.xml
index a4a4207..6a328e3 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml b/tests/xmlconfig-xml/boot-fullyvirt-disk-file.xml
index b163f63..9bedb93 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml b/tests/xmlconfig-xml/boot-fullyvirt-pxe-always.xml
index c8f206e..097c64d 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml b/tests/xmlconfig-xml/boot-fullyvirt-pxe-nodisks.xml
index dd1939e..c6890df 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml b/tests/xmlconfig-xml/boot-fullyvirt-pxe.xml
index 6f7dcbe..6183715 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-many-chars.xml b/tests/xmlconfig-xml/boot-many-chars.xml
index 045e7d2..de2e05f 100644
--- 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"/>
diff --git a/tests/xmlconfig-xml/boot-many-devices.xml b/tests/xmlconfig-xml/boot-many-devices.xml
index 0f01212..ea20b9b 100644
--- 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"/>
diff --git a/tests/xmlconfig-xml/boot-many-disks2.xml b/tests/xmlconfig-xml/boot-many-disks2.xml
index eb97010..81e7e2b 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-many-hostdevs.xml b/tests/xmlconfig-xml/boot-many-hostdevs.xml
index 2ef1379..604e273 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-many-nics.xml b/tests/xmlconfig-xml/boot-many-nics.xml
index b3c288e..028d7b0 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-many-sounds.xml b/tests/xmlconfig-xml/boot-many-sounds.xml
index 00dea27..7b72299 100644
--- 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"/>
diff --git a/tests/xmlconfig-xml/boot-usb2.xml b/tests/xmlconfig-xml/boot-usb2.xml
index e944d55..d8e4357 100644
--- 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>
diff --git a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml
index 2973adf..3c64d04 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-f10.xml b/tests/xmlconfig-xml/install-f10.xml
index eaf9124..5608997 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-f11-ac97.xml b/tests/xmlconfig-xml/install-f11-ac97.xml
index 28e5ca9..b359c6b 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-f11-noac97.xml b/tests/xmlconfig-xml/install-f11-noac97.xml
index b46782a..47efce0 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-f11-norheldefaults.xml b/tests/xmlconfig-xml/install-f11-norheldefaults.xml
index 28e5ca9..b359c6b 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-f11-qemu.xml b/tests/xmlconfig-xml/install-f11-qemu.xml
index 7119e1e..6083b49 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-f11-rheldefaults.xml b/tests/xmlconfig-xml/install-f11-rheldefaults.xml
index 33861a7..5b718c2 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-f11-xen.xml b/tests/xmlconfig-xml/install-f11-xen.xml
index 631a5f0..22e1a12 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-f11.xml b/tests/xmlconfig-xml/install-f11.xml
index 4cfd0a0..2a56e7c 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml b/tests/xmlconfig-xml/install-fullyvirt-disk-block.xml
index 7404723..0ba00bc 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml b/tests/xmlconfig-xml/install-fullyvirt-disk-file.xml
index 5b0a9b1..6e31d9d 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml b/tests/xmlconfig-xml/install-fullyvirt-import-kernel.xml
index 4afacc7..80ea6bc 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml b/tests/xmlconfig-xml/install-fullyvirt-import-multiboot.xml
index 3963b32..fc2ed95 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-import.xml b/tests/xmlconfig-xml/install-fullyvirt-import.xml
index 6f7dcbe..6183715 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-livecd.xml b/tests/xmlconfig-xml/install-fullyvirt-livecd.xml
index 7756147..17f662f 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml b/tests/xmlconfig-xml/install-fullyvirt-pxe-nodisks.xml
index e58c3c0..9d6d7fb 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-fullyvirt-pxe.xml b/tests/xmlconfig-xml/install-fullyvirt-pxe.xml
index bfc748c..232f7a6 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-kvm-keymap-local.xml b/tests/xmlconfig-xml/install-kvm-keymap-local.xml
index 00d7623..94c467d 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-kvm-keymap-none.xml b/tests/xmlconfig-xml/install-kvm-keymap-none.xml
index 00d7623..94c467d 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-windowsxp-kvm.xml b/tests/xmlconfig-xml/install-windowsxp-kvm.xml
index 7d54eab..f634e3b 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-windowsxp-xennew.xml b/tests/xmlconfig-xml/install-windowsxp-xennew.xml
index a761bc6..f9ffe8c 100644
--- 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>
diff --git a/tests/xmlconfig-xml/install-windowsxp-xenold.xml b/tests/xmlconfig-xml/install-windowsxp-xenold.xml
index 6b75521..aad9dde 100644
--- 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>
diff --git a/tests/xmlconfig-xml/misc-qemu-driver-name.xml b/tests/xmlconfig-xml/misc-qemu-driver-name.xml
index bf53c5d..c193cbd 100644
--- 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>
diff --git a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml
index fc5ff87..eb108f8 100644
--- 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>
diff --git a/tests/xmlconfig-xml/misc-qemu-driver-type.xml b/tests/xmlconfig-xml/misc-qemu-driver-type.xml
index 3978188..57e39f6 100644
--- 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>
diff --git a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml
index 290e971..3f129ad 100644
--- 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>
diff --git a/tests/xmlconfig-xml/misc-xml-escaping.xml b/tests/xmlconfig-xml/misc-xml-escaping.xml
index 8b4e987..b113015 100644
--- 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>
diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml
index 37bcc61..aa280c6 100644
--- 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>
diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml
index 3cad71e..6d56046 100644
--- 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>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage1.xml b/tests/xmlconfig-xml/winxp-kvm-stage1.xml
index 1fa3e16..5b7fc20 100644
--- 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>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage2.xml b/tests/xmlconfig-xml/winxp-kvm-stage2.xml
index 245802c..59c0532 100644
--- 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>
diff --git a/tests/xmlconfig-xml/winxp-kvm-stage3.xml b/tests/xmlconfig-xml/winxp-kvm-stage3.xml
index 5928059..50de4d5 100644
--- 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>
diff --git a/tests/xmlparse-xml/add-devices-in.xml b/tests/xmlparse-xml/add-devices-in.xml
index b84c3bd..97b7822 100644
--- 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">
diff --git a/tests/xmlparse-xml/add-devices-out.xml b/tests/xmlparse-xml/add-devices-out.xml
index d17e9a6..a44471b 100644
--- 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">
diff --git a/tests/xmlparse-xml/change-boot-multi-in.xml b/tests/xmlparse-xml/change-boot-multi-in.xml
index 94b6fb9..58e39c0 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-boot-multi-out.xml b/tests/xmlparse-xml/change-boot-multi-out.xml
index 224f268..da28a91 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-chars-in.xml b/tests/xmlparse-xml/change-chars-in.xml
index e36c45c..1fd40c2 100644
--- 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"/>
diff --git a/tests/xmlparse-xml/change-chars-out.xml b/tests/xmlparse-xml/change-chars-out.xml
index c94c3ad..eefc894 100644
--- 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"/>
diff --git a/tests/xmlparse-xml/change-disk-in.xml b/tests/xmlparse-xml/change-disk-in.xml
index d70d677..12f58cd 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/xmlparse-xml/change-disk-out.xml
index e27a821..87f2f57 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-graphics-in.xml b/tests/xmlparse-xml/change-graphics-in.xml
index 7d65efc..b39858c 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-graphics-out.xml b/tests/xmlparse-xml/change-graphics-out.xml
index 5badfd3..5c6b4ea 100644
--- 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"/>
diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/xmlparse-xml/change-guest-in.xml
index 0514dcc..a30db0c 100644
--- a/tests/xmlparse-xml/change-guest-in.xml
+++ b/tests/xmlparse-xml/change-guest-in.xml
@@ -60,7 +60,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>
diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml
index 80a34f0..5b64176 100644
--- a/tests/xmlparse-xml/change-guest-out.xml
+++ b/tests/xmlparse-xml/change-guest-out.xml
@@ -64,7 +64,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>
diff --git a/tests/xmlparse-xml/change-hostdevs-in.xml b/tests/xmlparse-xml/change-hostdevs-in.xml
index 22849d4..c2a84c2 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-hostdevs-out.xml b/tests/xmlparse-xml/change-hostdevs-out.xml
index ba54d4c..76b5331 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-nics-in.xml b/tests/xmlparse-xml/change-nics-in.xml
index ce3cfaa..944c290 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-nics-out.xml b/tests/xmlparse-xml/change-nics-out.xml
index d0f0556..032d711 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-rng-egd-in.xml b/tests/xmlparse-xml/change-rng-egd-in.xml
index e468f52..621c07a 100644
--- 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'/>
diff --git a/tests/xmlparse-xml/change-rng-egd-out.xml b/tests/xmlparse-xml/change-rng-egd-out.xml
index 29362c4..88e63e8 100644
--- 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"/>
diff --git a/tests/xmlparse-xml/change-rng-random-in.xml b/tests/xmlparse-xml/change-rng-random-in.xml
index 1beddc1..446173e 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-rng-random-out.xml b/tests/xmlparse-xml/change-rng-random-out.xml
index 1f4f04a..b98d4a2 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-smartcard-in.xml b/tests/xmlparse-xml/change-smartcard-in.xml
index c07010c..26804fc 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-smartcard-out.xml b/tests/xmlparse-xml/change-smartcard-out.xml
index d733f55..57ff4b2 100644
--- 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>
diff --git a/tests/xmlparse-xml/change-tpm-in.xml b/tests/xmlparse-xml/change-tpm-in.xml
index 78dd100..05a1154 100644
--- 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'>
diff --git a/tests/xmlparse-xml/change-tpm-out.xml b/tests/xmlparse-xml/change-tpm-out.xml
index a5f0682..599f88e 100644
--- 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">
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index 5f82365..333bed1 100644
--- 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
@@ -499,7 +499,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")
--
1.8.5.3
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
