From b8551d449c647951e9c1f2eccf9d35793588d3c4 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 3 Jul 2019 08:25:15 +0200
Subject: [PATCH] tests: Remove xml2sexprtest
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The test was the only place calling 'xenFormatSxpr'. Drop it as there
are no other users of that code since we've dropped xend support in
commit 1dac5fbbbb06a03.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/Makefile.am                             |  10 +-
 tests/virschematest.c                         |   2 +-
 tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr |   6 -
 tests/xml2sexprdata/xml2sexpr-boot-grub.xml   |  21 ---
 .../xml2sexpr-bridge-ipaddr.sexpr             |  12 --
 .../xml2sexprdata/xml2sexpr-bridge-ipaddr.xml |  29 ---
 tests/xml2sexprdata/xml2sexpr-curmem.sexpr    |   7 -
 tests/xml2sexprdata/xml2sexpr-curmem.xml      |  23 ---
 .../xml2sexpr-disk-block-shareable.sexpr      |   9 -
 .../xml2sexpr-disk-block-shareable.xml        |  31 ----
 .../xml2sexprdata/xml2sexpr-disk-block.sexpr  |  10 --
 tests/xml2sexprdata/xml2sexpr-disk-block.xml  |  22 ---
 .../xml2sexpr-disk-drv-blkback.sexpr          |  10 --
 .../xml2sexpr-disk-drv-blkback.xml            |  23 ---
 .../xml2sexpr-disk-drv-blktap-qcow.sexpr      |  10 --
 .../xml2sexpr-disk-drv-blktap-qcow.xml        |  23 ---
 .../xml2sexpr-disk-drv-blktap-raw.sexpr       |  10 --
 .../xml2sexpr-disk-drv-blktap-raw.xml         |  23 ---
 .../xml2sexpr-disk-drv-blktap.sexpr           |  10 --
 .../xml2sexpr-disk-drv-blktap.xml             |  23 ---
 .../xml2sexpr-disk-drv-blktap2-raw.sexpr      |  10 --
 .../xml2sexpr-disk-drv-blktap2-raw.xml        |  23 ---
 .../xml2sexpr-disk-drv-blktap2.sexpr          |  10 --
 .../xml2sexpr-disk-drv-blktap2.xml            |  23 ---
 .../xml2sexpr-disk-drv-loop.sexpr             |  10 --
 .../xml2sexprdata/xml2sexpr-disk-drv-loop.xml |  23 ---
 tests/xml2sexprdata/xml2sexpr-disk-file.sexpr |  10 --
 tests/xml2sexprdata/xml2sexpr-disk-file.xml   |  22 ---
 tests/xml2sexprdata/xml2sexpr-escape.sexpr    |  11 --
 tests/xml2sexprdata/xml2sexpr-escape.xml      |  24 ---
 .../xml2sexpr-fv-force-hpet.sexpr             |  12 --
 .../xml2sexprdata/xml2sexpr-fv-force-hpet.xml |  39 ----
 .../xml2sexpr-fv-force-nohpet.sexpr           |  12 --
 .../xml2sexpr-fv-force-nohpet.xml             |  39 ----
 tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr |  12 --
 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml   |  24 ---
 .../xml2sexpr-fv-localtime.sexpr              |  12 --
 .../xml2sexprdata/xml2sexpr-fv-localtime.xml  |  37 ----
 .../xml2sexpr-fv-net-many-models.sexpr        |   1 -
 .../xml2sexpr-fv-net-many-models.xml          |  43 -----
 .../xml2sexpr-fv-net-netfront.sexpr           |  10 --
 .../xml2sexpr-fv-net-netfront.xml             |  31 ----
 .../xml2sexprdata/xml2sexpr-fv-net-rate.sexpr |  10 --
 tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml |  34 ----
 .../xml2sexpr-fv-parallel-tcp.sexpr           |  12 --
 .../xml2sexpr-fv-parallel-tcp.xml             |  40 -----
 .../xml2sexpr-fv-serial-dev-2-ports.sexpr     |  13 --
 .../xml2sexpr-fv-serial-dev-2-ports.xml       |  44 -----
 .../xml2sexpr-fv-serial-dev-2nd-port.sexpr    |  12 --
 .../xml2sexpr-fv-serial-dev-2nd-port.xml      |  40 -----
 .../xml2sexpr-fv-serial-file.sexpr            |  13 --
 .../xml2sexpr-fv-serial-file.xml              |  40 -----
 .../xml2sexpr-fv-serial-null.sexpr            |  12 --
 .../xml2sexpr-fv-serial-null.xml              |  39 ----
 .../xml2sexpr-fv-serial-pipe.sexpr            |  13 --
 .../xml2sexpr-fv-serial-pipe.xml              |  40 -----
 .../xml2sexpr-fv-serial-pty.sexpr             |  12 --
 .../xml2sexprdata/xml2sexpr-fv-serial-pty.xml |  39 ----
 .../xml2sexpr-fv-serial-stdio.sexpr           |  12 --
 .../xml2sexpr-fv-serial-stdio.xml             |  39 ----
 .../xml2sexpr-fv-serial-tcp-telnet.sexpr      |  13 --
 .../xml2sexpr-fv-serial-tcp-telnet.xml        |  41 -----
 .../xml2sexpr-fv-serial-tcp.sexpr             |  13 --
 .../xml2sexprdata/xml2sexpr-fv-serial-tcp.xml |  40 -----
 .../xml2sexpr-fv-serial-udp.sexpr             |  13 --
 .../xml2sexprdata/xml2sexpr-fv-serial-udp.xml |  41 -----
 .../xml2sexpr-fv-serial-unix.sexpr            |  13 --
 .../xml2sexpr-fv-serial-unix.xml              |  40 -----
 tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr  |  12 --
 tests/xml2sexprdata/xml2sexpr-fv-sound.xml    |  38 ----
 .../xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr |  12 --
 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml |  37 ----
 .../xml2sexpr-fv-usbtablet.sexpr              |  10 --
 .../xml2sexprdata/xml2sexpr-fv-usbtablet.xml  |  36 ----
 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr    |  12 --
 tests/xml2sexprdata/xml2sexpr-fv-utc.xml      |  37 ----
 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr     |  11 --
 .../xml2sexpr-fv-vncunused.sexpr              |  11 --
 .../xml2sexprdata/xml2sexpr-fv-vncunused.xml  |  36 ----
 tests/xml2sexprdata/xml2sexpr-fv.sexpr        |  12 --
 tests/xml2sexprdata/xml2sexpr-fv.xml          |  36 ----
 .../xml2sexprdata/xml2sexpr-net-bridged.sexpr |  11 --
 tests/xml2sexprdata/xml2sexpr-net-bridged.xml |  28 ---
 tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr |  11 --
 tests/xml2sexprdata/xml2sexpr-net-e1000.xml   |  29 ---
 .../xml2sexprdata/xml2sexpr-net-routed.sexpr  |  11 --
 tests/xml2sexprdata/xml2sexpr-net-routed.xml  |  28 ---
 .../xml2sexpr-no-source-cdrom.sexpr           |  10 --
 .../xml2sexpr-no-source-cdrom.xml             |  37 ----
 tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr  |  10 --
 tests/xml2sexprdata/xml2sexpr-pci-devs.xml    |  32 ----
 .../xml2sexpr-pv-bootloader-cmdline.sexpr     |   6 -
 .../xml2sexpr-pv-bootloader-cmdline.xml       |  22 ---
 .../xml2sexpr-pv-bootloader.sexpr             |   7 -
 .../xml2sexprdata/xml2sexpr-pv-bootloader.xml |  18 --
 .../xml2sexpr-pv-localtime.sexpr              |   8 -
 .../xml2sexprdata/xml2sexpr-pv-localtime.xml  |  25 ---
 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr  |   9 -
 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml    |  22 ---
 .../xml2sexpr-pv-vfb-new-auto.sexpr           |  11 --
 .../xml2sexpr-pv-vfb-new-auto.xml             |  23 ---
 .../xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr  |  11 --
 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml  |  23 ---
 tests/xml2sexprdata/xml2sexpr-pv.sexpr        |   9 -
 tests/xml2sexprdata/xml2sexpr-pv.xml          |  22 ---
 tests/xml2sexprtest.c                         | 167 ------------------
 106 files changed, 3 insertions(+), 2317 deletions(-)
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.sexpr
 delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.xml
 delete mode 100644 tests/xml2sexprtest.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e57d0da58a..90bf94fe08 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -158,7 +158,6 @@ EXTRA_DIST = \
 	vmx2xmldata \
 	xlconfigdata \
 	xmconfigdata \
-	xml2sexprdata \
 	xml2vmxdata \
 	virstorageutildata \
 	virfilecachedata \
@@ -268,7 +267,7 @@ endif WITH_SECDRIVER_SELINUX
 ssh_SOURCES = ssh.c
 
 if WITH_LIBXL
-test_programs += xlconfigtest xml2sexprtest sexpr2xmltest \
+test_programs += xlconfigtest sexpr2xmltest \
 	xmconfigtest libxlxml2domconfigtest
 test_libraries += libxltestdriver.la libxlmock.la
 endif WITH_LIBXL
@@ -504,11 +503,6 @@ xlconfigtest_SOURCES = \
 	testutils.c testutils.h
 xlconfigtest_LDADD =$(libxl_LDADDS)
 
-xml2sexprtest_SOURCES = \
-	xml2sexprtest.c testutilsxen.c testutilsxen.h \
-	testutils.c testutils.h
-xml2sexprtest_LDADD = $(libxl_LDADDS)
-
 sexpr2xmltest_SOURCES = \
 	sexpr2xmltest.c testutilsxen.c testutilsxen.h \
 	testutils.c testutils.h
@@ -531,7 +525,7 @@ libxlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
 libxlmock_la_LIBADD = $(MOCKLIBS_LIBS)
 
 else ! WITH_LIBXL
-EXTRA_DIST += xlconfigtest.c xml2sexprtest.c sexpr2xmltest.c \
+EXTRA_DIST += xlconfigtest.c sexpr2xmltest.c \
 	xmconfigtest.c libxlxml2domconfigtest.c
 endif ! WITH_LIBXL
 
diff --git a/tests/virschematest.c b/tests/virschematest.c
index b7c2f7cfaa..bffde4ba06 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -217,7 +217,7 @@ mymain(void)
     DO_TEST_DIR("capability.rng", "capabilityschemadata", "vircaps2xmldata");
     DO_TEST_DIR("domain.rng", "domainschemadata",
                 "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata",
-                "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata",
+                "qemuxml2xmloutdata", "lxcxml2xmldata",
                 "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata",
                 "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata",
                 "qemuhotplugtestdomains");
diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
deleted file mode 100644
index 923d282e22..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
+++ /dev/null
@@ -1,6 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(image (linux \
-(kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')\
-(localtime 0)))(localtime 0)\
-(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.xml b/tests/xml2sexprdata/xml2sexpr-boot-grub.xml
deleted file mode 100644
index c4b92dcd00..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-boot-grub.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel>
-    <cmdline>(hd0,0)/grub/menu.lst</cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='block' device='disk'>
-      <source dev='/dev/MainVG/GuestLV'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
deleted file mode 100644
index 68305074f8..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(image (linux \
-(kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge')(ip '192.0.2.1'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
deleted file mode 100644
index d72f986915..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <interface type="bridge">
-      <mac address="00:11:22:33:44:55"/>
-      <source bridge="xenbr2"/>
-      <ip address="192.0.2.1"/>
-      <script path="vif-bridge"/>
-      <target dev="vif4.0"/>
-    </interface>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
deleted file mode 100644
index 4b9fbb397b..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
+++ /dev/null
@@ -1,7 +0,0 @@
-(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\
-(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\
-(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
-(image (linux (localtime 0)))(localtime 0)\
-(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\
-(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\
-(script 'vif-bridge'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.xml b/tests/xml2sexprdata/xml2sexpr-curmem.xml
deleted file mode 100644
index 826effb2a0..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-curmem.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='5'>
-  <name>rhel5</name>
-  <uuid>4f77abd2301958e83bab6fbf2118f880</uuid>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <memory unit='KiB'>394240</memory>
-  <currentMemory unit='KiB'>179200</currentMemory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1d:06:15'/>
-      <script path='vif-bridge'/>
-    </interface>
-    <disk type='file' device='disk'>
-      <driver name='tap' type='aio'/>
-      <source file='/xen/rhel5.img'/>
-      <target dev='xvda'/>
-    </disk>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
deleted file mode 100644
index e0131364bb..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\
-(uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')\
-(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
-(image (linux (args 'ro root=/dev/VolGroup00/LogVol00')(localtime 0)))\
-(localtime 0)\
-(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\
-(mode 'w!')))\
-(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\
-(script 'vif-bridge'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
deleted file mode 100644
index b7bb21438f..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen'>
-  <name>pvtest</name>
-  <uuid>49a0c6ffc066539264983632d093c2e7</uuid>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/boot_kernel.BCkYBN</kernel>
-    <initrd>/var/lib/xen/boot_ramdisk.sjOK9_</initrd>
-    <cmdline>ro root=/dev/VolGroup00/LogVol00</cmdline>
-  </os>
-  <currentMemory unit='KiB'>393216</currentMemory>
-  <memory unit='KiB'>524288</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='tap' type='aio'/>
-      <source file='/var/lib/xen/images/rhel5pv.img'/>
-      <target dev='xvda'/>
-      <shareable/>
-    </disk>
-    <interface type='bridge'>
-      <mac address='00:16:3e:23:9e:eb'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-    </interface>
-    <console/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
deleted file mode 100644
index ce1fd23185..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.xml b/tests/xml2sexprdata/xml2sexpr-disk-block.xml
deleted file mode 100644
index c38717614a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-block.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='block' device='disk'>
-      <source dev='/dev/MainVG/GuestLV'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
deleted file mode 100644
index ce1fd23185..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
deleted file mode 100644
index a1c528f507..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='block' device='disk'>
-      <driver name="phy"/>
-      <source dev='/dev/MainVG/GuestLV'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
deleted file mode 100644
index d44de4f0cb..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (tap (dev 'xvda')\
-(uname 'tap:qcow:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
deleted file mode 100644
index e6ad42b099..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name="tap" type="qcow"/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
deleted file mode 100644
index 47e00365d3..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (tap (dev 'xvda')\
-(uname 'tap:aio:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
deleted file mode 100644
index f5670d2d20..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name="tap" type="aio"/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
deleted file mode 100644
index 47e00365d3..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (tap (dev 'xvda')\
-(uname 'tap:aio:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
deleted file mode 100644
index a32cd278d3..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name="tap"/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
deleted file mode 100644
index bc6c9232ff..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (tap2 (dev 'xvda')\
-(uname 'tap2:aio:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml
deleted file mode 100644
index f531250c9f..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name="tap2" type="aio"/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
deleted file mode 100644
index bc6c9232ff..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (tap2 (dev 'xvda')\
-(uname 'tap2:aio:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml
deleted file mode 100644
index e0384b2669..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name="tap2"/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
deleted file mode 100644
index be7ce1a653..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
deleted file mode 100644
index a7e662c8b1..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name="file"/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
deleted file mode 100644
index be7ce1a653..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-file.xml b/tests/xml2sexprdata/xml2sexpr-disk-file.xml
deleted file mode 100644
index 828d450d24..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-file.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-escape.sexpr b/tests/xml2sexprdata/xml2sexpr-escape.sexpr
deleted file mode 100644
index 75411ceb1a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-escape.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os&version="devel"  ')\
-(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(pae 1)(usb 1)(parallel none)\
-(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')(rtc_timeoffset 0)\
-(localtime 0)))(localtime 0)\
-(device (vbd (dev 'xvda:disk')(uname 'file:/root/\'\\some.img')(mode 'w'))))
diff --git a/tests/xml2sexprdata/xml2sexpr-escape.xml b/tests/xml2sexprdata/xml2sexpr-escape.xml
deleted file mode 100644
index 7cc8477211..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-escape.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type='xen' id='15'>
-  <name>fvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>hvm</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os&amp;version="devel"  </cmdline>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type='file' device='disk'>
-      <source file='/root/&apos;\some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
deleted file mode 100644
index 92ccfdfa1a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml
deleted file mode 100644
index fbf360573e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='utc'>
-    <timer name='hpet' present='yes'/>
-  </clock>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
deleted file mode 100644
index 4455c425a4..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml
deleted file mode 100644
index e7144cf9bc..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='utc'>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
deleted file mode 100644
index 912ea32f72..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
-(boot c)(pae 1)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib/xen/bin/qemu-dm')\
-(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda:disk')(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml b/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
deleted file mode 100644
index 144e09f335..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type='xen' id='15'>
-  <name>fvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>hvm</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
deleted file mode 100644
index 75937fbd81..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 1)))\
-(localtime 1)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml b/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
deleted file mode 100644
index 2360ec7764..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='localtime'/>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
deleted file mode 100644
index 118dfd87bb..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
+++ /dev/null
@@ -1 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(pae 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(rtc_timeoffset 0)(localtime 0)))(localtime 0)(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr0')(script 'vif-bridge')(model 'idontexist')))(device (vif (mac '00:11:22:33:44:56')(bridge 'xenbr0')(script 'vif-bridge')(model 'vmxnet3')))(device (vif (mac '00:11:22:33:44:57')(bridge 'xenbr0')(script 'vif-bridge')(type netfront)))(device (vif (mac '00:11:22:33:44:58')(bridge 'xenbr0')(script 'vif-bridge')(model 'virtio')))(device (vif (mac '00:11:22:33:44:58')(bridge 'xenbr0')(script 'vif-bridge')(model 'ne2k_pci')))(device (vif (mac '00:11:22:33:44:58')(bridge 'xenbr0')(script 'vif-bridge')(model 'pcnet'))))
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml b/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
deleted file mode 100644
index e95cba7f6a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:11:22:33:44:55'/>
-      <model type='idontexist'/>
-    </interface>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:11:22:33:44:56'/>
-      <model type='vmxnet3'/>
-    </interface>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:11:22:33:44:57'/>
-      <model type='netfront'/>
-    </interface>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:11:22:33:44:58'/>
-      <model type='virtio'/>
-    </interface>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:11:22:33:44:58'/>
-      <model type='ne2k_pci'/>
-    </interface>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:11:22:33:44:58'/>
-      <model type='pcnet'/>
-    </interface>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
deleted file mode 100644
index 429c1d057a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
-(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type netfront))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml
deleted file mode 100644
index efabc36339..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='netfront'/>
-    </interface>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
deleted file mode 100644
index 3c126efd30..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
-(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(rate '10240KB/s')\
-(bridge 'xenbr0')(script 'vif-bridge')(type netfront))))
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml b/tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml
deleted file mode 100644
index caea525e58..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <bandwidth>
-        <outbound average='10240'/>
-      </bandwidth>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='netfront'/>
-    </interface>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
deleted file mode 100644
index 60db1f9934..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel tcp:localhost:9999)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
deleted file mode 100644
index 3f0176e768..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <parallel type='tcp'>
-      <source mode='connect' host='localhost' service='9999'/>
-      <target port='0'/>
-    </parallel>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
deleted file mode 100644
index 142377ea57..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml
deleted file mode 100644
index 643db65e37..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='dev'>
-      <source path='/dev/ttyS0'/>
-      <target port='0'/>
-    </serial>
-    <serial type='dev'>
-      <source path='/dev/ttyS1'/>
-      <target port='1'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
deleted file mode 100644
index f74ed39b46..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml
deleted file mode 100644
index 3afaa4c29d..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='dev'>
-      <source path='/dev/ttyS1'/>
-      <target port='1'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
deleted file mode 100644
index be8ccc3391..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
deleted file mode 100644
index 411530d824..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='file'>
-      <source path='/tmp/serial.log'/>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
deleted file mode 100644
index 763ddf9437..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial null)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
deleted file mode 100644
index b8285bcf4f..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='null'>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
deleted file mode 100644
index 6ece05f9be..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
deleted file mode 100644
index 4316cdef31..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='pipe'>
-      <source path='/tmp/serial.pipe'/>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
deleted file mode 100644
index 73eed6489c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
deleted file mode 100644
index 9e162499d3..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
deleted file mode 100644
index 7f144bee02..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial stdio)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
deleted file mode 100644
index 068b188ce7..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='stdio'>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
deleted file mode 100644
index 68204e60db..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial telnet:localhost:9999,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
deleted file mode 100644
index f510e40e74..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='tcp'>
-      <source mode='bind' host='localhost' service='9999'/>
-      <protocol type='telnet'/>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
deleted file mode 100644
index 4bec5ec09c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial tcp:localhost:9999,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
deleted file mode 100644
index 69603fea3a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='tcp'>
-      <source mode='bind' host='localhost' service='9999'/>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
deleted file mode 100644
index c887edb9aa..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial udp:localhost:9998@localhost:9999)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
deleted file mode 100644
index ec94ebf185..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='udp'>
-      <source mode='connect' host='localhost' service='9998'/>
-      <source mode='bind' host='localhost' service='9999'/>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
deleted file mode 100644
index 46c0905520..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial unix:/tmp/serial.sock,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
deleted file mode 100644
index 6d87bea57c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <serial type='unix'>
-      <source mode='bind' path='/tmp/serial.sock'/>
-      <target port='0'/>
-    </serial>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
deleted file mode 100644
index 8dfdaecf26..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml b/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
deleted file mode 100644
index ec55ef330d..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-    <sound model='sb16'/>
-    <sound model='es1370'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
deleted file mode 100644
index 8b97b1033e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(usbdevice mouse)(parallel none)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
deleted file mode 100644
index 9af0df4f4e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <input type='mouse' bus='usb'/>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
deleted file mode 100644
index 6a192bbd44..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(rtc_timeoffset 0)(localtime 0)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(type ioemu))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
deleted file mode 100644
index d619e8f9fb..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <input type='tablet' bus='usb'/>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
deleted file mode 100644
index 8733764996..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.xml b/tests/xml2sexprdata/xml2sexpr-fv-utc.xml
deleted file mode 100644
index a916e4147a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-utc.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='utc'/>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
deleted file mode 100644
index 30b7596962..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
deleted file mode 100644
index 31b56ee04e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 1)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)(device (vbd (dev 'hda:disk')\
-(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
deleted file mode 100644
index 92e7cf1be0..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <graphics type='vnc' port='-1' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv.sexpr b/tests/xml2sexprdata/xml2sexpr-fv.sexpr
deleted file mode 100644
index 8733764996..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv.xml b/tests/xml2sexprdata/xml2sexpr-fv.xml
deleted file mode 100644
index 4e77f5d802..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen'>
-  <name>fvtest</name>
-  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <features>
-    <acpi/>
-  </features>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='file'>
-      <source file='/root/foo.img'/>
-      <target dev='ioemu:hda'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <graphics type='vnc' port='5917' keymap='ja'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
deleted file mode 100644
index a581fa0765..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml b/tests/xml2sexprdata/xml2sexpr-net-bridged.xml
deleted file mode 100644
index d995d19c8d..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <interface type="bridge">
-      <mac address="00:11:22:33:44:55"/>
-      <source bridge="xenbr2"/>
-      <script path="vif-bridge"/>
-      <target dev="vif4.0"/>
-    </interface>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr b/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
deleted file mode 100644
index 4e650d4776..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-net-e1000.xml b/tests/xml2sexprdata/xml2sexpr-net-e1000.xml
deleted file mode 100644
index e49518d875..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-e1000.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <interface type="bridge">
-      <mac address="00:11:22:33:44:55"/>
-      <source bridge="xenbr2"/>
-      <script path="vif-bridge"/>
-      <model type='e1000'/>
-      <target dev="vif4.0"/>
-    </interface>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr b/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
deleted file mode 100644
index adc2dd0a17..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')\
-(ip '172.14.5.6'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-net-routed.xml b/tests/xml2sexprdata/xml2sexpr-net-routed.xml
deleted file mode 100644
index 2adc3a7941..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-routed.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <interface type="ethernet">
-      <mac address="00:11:22:33:44:55"/>
-      <ip address="172.14.5.6"/>
-      <script path="vif-routed"/>
-      <target dev="vif4.0"/>
-    </interface>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
deleted file mode 100644
index cff05a8cfa..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)\
-(uuid 'cc2315e7-d26a-307a-438c-6d188ec4c09c')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
-(apic 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)\
-(rtc_timeoffset 0)(localtime 0)))(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')(mode 'r')))\
-(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
deleted file mode 100644
index 65a6c019b4..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
-  <name>test</name>
-  <uuid>cc2315e7d26a307a438c6d188ec4c09c</uuid>
-  <os>
-    <type>hvm</type>
-    <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <memory unit='KiB'>391168</memory>
-  <currentMemory unit='KiB'>358400</currentMemory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <devices>
-    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-    <interface type='ethernet'>
-      <mac address='00:16:3e:0a:7b:39'/>
-      <model type='e1000'/>
-    </interface>
-    <disk type='block' device='disk'>
-      <driver name='phy'/>
-      <source dev='/dev/sda8'/>
-      <target dev='hda'/>
-    </disk>
-    <disk device='cdrom'>
-      <target dev='hdc'/>
-      <readonly/>
-    </disk>
-    <graphics type='vnc' port='5906'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
deleted file mode 100644
index 1ce3c1cd19..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))\
-(device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))\
-(dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.xml b/tests/xml2sexprdata/xml2sexpr-pci-devs.xml
deleted file mode 100644
index a2d9d7e8e8..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pci-devs.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='block' device='disk'>
-      <source dev='/dev/MainVG/GuestLV'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-    <hostdev mode='subsystem' type='pci' managed='no'>
-      <source>
-        <address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/>
-      </source>
-    </hostdev>
-    <hostdev mode='subsystem' type='pci' managed='no'>
-      <source>
-        <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/>
-      </source>
-    </hostdev>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
deleted file mode 100644
index 7a592a4f35..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
+++ /dev/null
@@ -1,6 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\
-(bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\
-(on_crash 'destroy')(image (linux (args 'xenfb.video=8,1280,1024')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml
deleted file mode 100644
index e4f468504b..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <bootloader_args>-q</bootloader_args>
- <os>
-    <type>linux</type>
-    <cmdline>xenfb.video=8,1280,1024</cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
deleted file mode 100644
index 7ecf6d2192..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
+++ /dev/null
@@ -1,7 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\
-(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (localtime 0)))(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
deleted file mode 100644
index 98bd8ecf54..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <bootloader>/usr/bin/pypxeboot</bootloader>
-  <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
deleted file mode 100644
index 4effc921ba..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\
-(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\
-(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
-(image (linux (localtime 1)))(localtime 1)\
-(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\
-(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\
-(script 'vif-bridge')))\
-(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 5))))
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml b/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml
deleted file mode 100644
index d4ea7ee2c5..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<domain type='xen' id='5'>
-  <name>rhel5</name>
-  <uuid>4f77abd2301958e83bab6fbf2118f880</uuid>
-  <bootloader>/usr/bin/pygrub</bootloader>
-  <memory unit='KiB'>394240</memory>
-  <currentMemory unit='KiB'>179200</currentMemory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <clock offset='localtime'/>
-  <devices>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <mac address='00:16:3e:1d:06:15'/>
-      <script path='vif-bridge'/>
-    </interface>
-    <disk type='file' device='disk'>
-      <driver name='tap' type='aio'/>
-      <source file='/xen/rhel5.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <graphics type='vnc' port='5905'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
deleted file mode 100644
index 7dba66045d..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)(vcpu_avail 3)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
deleted file mode 100644
index c416c5202c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu current='2'>4</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
deleted file mode 100644
index 5d74e9485e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
-(device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')\
-(vncpasswd '123456')(keymap 'ja'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml
deleted file mode 100644
index 0fb6ba067e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <graphics type='vnc' port='-1' autoport='yes' listen="127.0.0.1" passwd="123456" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
deleted file mode 100644
index 2ba35da7f2..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
-(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\
-(vncpasswd '123456')(keymap 'ja'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml
deleted file mode 100644
index f5f15a8b07..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file'/>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <graphics type='vnc' port='5906' listen="127.0.0.1" passwd="123456" keymap="ja"/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv.sexpr b/tests/xml2sexprdata/xml2sexpr-pv.sexpr
deleted file mode 100644
index ea26f8c57f..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv.xml b/tests/xml2sexprdata/xml2sexpr-pv.xml
deleted file mode 100644
index 828d450d24..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
-  <name>pvtest</name>
-  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <memory unit='KiB'>430080</memory>
-  <vcpu>2</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <source file='/root/some.img'/>
-      <target dev='xvda'/>
-    </disk>
-    <console tty='/dev/pts/4'/>
-  </devices>
-</domain>
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
deleted file mode 100644
index 64383876ab..0000000000
--- a/tests/xml2sexprtest.c
+++ /dev/null
@@ -1,167 +0,0 @@
-#include <config.h>
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "internal.h"
-#include "xenconfig/xen_sxpr.h"
-#include "testutils.h"
-#include "testutilsxen.h"
-#include "virstring.h"
-#include "libxl/libxl_conf.h"
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-static virCapsPtr caps;
-static virDomainXMLOptionPtr xmlopt;
-
-static int
-testCompareFiles(const char *xml, const char *sexpr)
-{
-    char *gotsexpr = NULL;
-    int ret = -1;
-    virDomainDefPtr def = NULL;
-
-    if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
-                                      VIR_DOMAIN_DEF_PARSE_INACTIVE)))
-        goto fail;
-
-    if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
-        fprintf(stderr, "ABI stability check failed on %s", xml);
-        goto fail;
-    }
-
-    if (!(gotsexpr = xenFormatSxpr(NULL, def)))
-        goto fail;
-
-    if (virTestCompareToFile(gotsexpr, sexpr) < 0)
-        goto fail;
-
-    ret = 0;
-
- fail:
-    VIR_FREE(gotsexpr);
-    virDomainDefFree(def);
-
-    return ret;
-}
-
-struct testInfo {
-    const char *input;
-    const char *output;
-    const char *name;
-};
-
-static int
-testCompareHelper(const void *data)
-{
-    int result = -1;
-    const struct testInfo *info = data;
-    char *xml = NULL;
-    char *args = NULL;
-
-    if (virAsprintf(&xml, "%s/xml2sexprdata/xml2sexpr-%s.xml",
-                    abs_srcdir, info->input) < 0 ||
-        virAsprintf(&args, "%s/xml2sexprdata/xml2sexpr-%s.sexpr",
-                    abs_srcdir, info->output) < 0) {
-        goto cleanup;
-    }
-
-    result = testCompareFiles(xml, args);
-
- cleanup:
-    VIR_FREE(xml);
-    VIR_FREE(args);
-
-    return result;
-}
-
-static int
-mymain(void)
-{
-    int ret = 0;
-
-#define DO_TEST(in, out, name) \
-    do { \
-        struct testInfo info = { in, out, name }; \
-        virResetLastError(); \
-        if (virTestRun("Xen XML-2-SEXPR " in " -> " out, \
-                       testCompareHelper, &info) < 0) \
-            ret = -1; \
-    } while (0)
-
-    if (!(caps = testXLInitCaps()))
-        return EXIT_FAILURE;
-
-    if (!(xmlopt = libxlCreateXMLConf()))
-        return EXIT_FAILURE;
-
-    DO_TEST("pv", "pv", "pvtest");
-    DO_TEST("fv", "fv", "fvtest");
-    DO_TEST("pv", "pv", "pvtest");
-    DO_TEST("fv", "fv-v2", "fvtest");
-    DO_TEST("fv-vncunused", "fv-vncunused", "fvtest");
-    DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest");
-    DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto", "pvtest");
-    DO_TEST("pv-bootloader", "pv-bootloader", "pvtest");
-    DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline", "pvtest");
-    DO_TEST("pv-vcpus", "pv-vcpus", "pvtest");
-
-    DO_TEST("disk-file", "disk-file", "pvtest");
-    DO_TEST("disk-block", "disk-block", "pvtest");
-    DO_TEST("disk-block-shareable", "disk-block-shareable", "pvtest");
-    DO_TEST("disk-drv-loop", "disk-drv-loop", "pvtest");
-    DO_TEST("disk-drv-blkback", "disk-drv-blkback", "pvtest");
-    DO_TEST("disk-drv-blktap", "disk-drv-blktap", "pvtest");
-    DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw", "pvtest");
-    DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", "pvtest");
-    DO_TEST("disk-drv-blktap2", "disk-drv-blktap2", "pvtest");
-    DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw", "pvtest");
-
-    DO_TEST("curmem", "curmem", "rhel5");
-    DO_TEST("net-routed", "net-routed", "pvtest");
-    DO_TEST("net-bridged", "net-bridged", "pvtest");
-    DO_TEST("net-e1000", "net-e1000", "pvtest");
-    DO_TEST("bridge-ipaddr", "bridge-ipaddr", "pvtest");
-    DO_TEST("no-source-cdrom", "no-source-cdrom", "test");
-    DO_TEST("pv-localtime", "pv-localtime", "pvtest");
-    DO_TEST("pci-devs", "pci-devs", "pvtest");
-
-    DO_TEST("fv-utc", "fv-utc", "fvtest");
-    DO_TEST("fv-localtime", "fv-localtime", "fvtest");
-    DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest");
-    DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest");
-    DO_TEST("fv-kernel", "fv-kernel", "fvtest");
-    DO_TEST("fv-force-hpet", "fv-force-hpet", "fvtest");
-    DO_TEST("fv-force-nohpet", "fv-force-nohpet", "fvtest");
-
-    DO_TEST("fv-serial-null", "fv-serial-null", "fvtest");
-    DO_TEST("fv-serial-file", "fv-serial-file", "fvtest");
-    DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports", "fvtest");
-    DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port", "fvtest");
-    DO_TEST("fv-serial-stdio", "fv-serial-stdio", "fvtest");
-    DO_TEST("fv-serial-pty", "fv-serial-pty", "fvtest");
-    DO_TEST("fv-serial-pipe", "fv-serial-pipe", "fvtest");
-    DO_TEST("fv-serial-tcp", "fv-serial-tcp", "fvtest");
-    DO_TEST("fv-serial-udp", "fv-serial-udp", "fvtest");
-    DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet", "fvtest");
-    DO_TEST("fv-serial-unix", "fv-serial-unix", "fvtest");
-    DO_TEST("fv-parallel-tcp", "fv-parallel-tcp", "fvtest");
-
-    DO_TEST("fv-sound", "fv-sound", "fvtest");
-
-    DO_TEST("fv-net-many-models", "fv-net-many-models", "fvtest");
-    DO_TEST("fv-net-netfront", "fv-net-netfront", "fvtest");
-    DO_TEST("fv-net-rate", "fv-net-rate", "fvtest");
-
-    DO_TEST("boot-grub", "boot-grub", "fvtest");
-    DO_TEST("escape", "escape", "fvtest");
-
-    virObjectUnref(caps);
-    virObjectUnref(xmlopt);
-
-    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-VIR_TEST_MAIN(mymain)
-- 
2.47.2