Xen: tests: use latest XEND_CONFIG_VERSION in xml2sexpr tests

Change all xml2sexpr tests to use the latest XEND_CONFIG_VERSION
(XEND_CONFIG_VERSION_3_1_0 = 4). Fix tests that do not conform to
the latest version.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>

diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
index 4850bc02c860b6df20a62be58e00811939483673..923d282e2296769debc710b7522b9265b0f669f1 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
@@ -1,6 +1,6 @@
 (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)\
+(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-bridge-ipaddr.sexpr b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
index 47c4a3ed6c9f0f76d7a4e47111385f580f76728e..68305074f81eb26b31cab13dcc27d2f08df69749 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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-curmem.sexpr b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
index 89d48b2796144a8f0cab2421192b81f14067025a..4b9fbb397ba933dcd675df3e9bf639b3af044138 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
@@ -1,7 +1,7 @@
 (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')\
-(localtime 0)\
+(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-disk-block-shareable.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
index dd03f7bfbae159fa3527e349151617f287b593b2..e0131364bb32ed9f192569db543436ba46e2b8d4 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
@@ -1,7 +1,7 @@
 (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')))\
+(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!')))\

diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
index b04c618163628ec01f7183b90b134893bc64bfd6..ce1fd2318505bc94249c36d13b537e62d472ebcb 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
index b04c618163628ec01f7183b90b134893bc64bfd6..ce1fd2318505bc94249c36d13b537e62d472ebcb 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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-blktap-qcow.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
index 6341d040c3d35ce18b193324e7efba697333a0b9..d44de4f0cbd43a8c4b4530cdfb1d2fdb064da0b8 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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-raw.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
index 6a6a43a3747a9e32ff086798b7666abf9b281d2a..47e00365d346a9d72976c9198328091dc417f355 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
index 6a6a43a3747a9e32ff086798b7666abf9b281d2a..47e00365d346a9d72976c9198328091dc417f355 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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-blktap2-raw.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
index b1caabb97e03e00e9dae9397c1ceabb3ca3cfa6a..bc6c9232fff233da9b0408292b144fcf2b66eea0 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
index b1caabb97e03e00e9dae9397c1ceabb3ca3cfa6a..bc6c9232fff233da9b0408292b144fcf2b66eea0 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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-loop.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
index 8bf6d7a5fa85019b2c6574b311e39be96639d8b7..be7ce1a6535a1d32f8e64b64347198d7f34ea1e1 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
index 8bf6d7a5fa85019b2c6574b311e39be96639d8b7..be7ce1a6535a1d32f8e64b64347198d7f34ea1e1 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
@@ -4,7 +4,7 @@
 (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  ')))\
+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-escape.sexpr b/tests/xml2sexprdata/xml2sexpr-escape.sexpr
index 7f70adb5c2371c2d858b3f1f131a1c4b4c774843..3c2ab8cd29fcb944afd115f9daf78267cc3f21cb 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-escape.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-escape.sexpr
@@ -6,6 +6,6 @@
 (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)(usb 1)(parallel none)\
-(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))\
-(localtime 0)\
-(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w'))))\
+(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-force-hpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
index 096229f27c970fbdbbdb3c700d9b607c6fe54f27..a6dcf1db430686a082fe8cfdfe8d419bcafb9f96 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
index f9c583137da5560cd2cfb8c0ee0200385f6ad795..ffa33613d85f0b9a6189303bda097d3fc9128799 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
index edaa775a51a7aaa5673be1fe07800f96c2ad18e1..e2c15950f2a622b683f1cf5f6f08fef97a96a8ed 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
@@ -6,6 +6,7 @@
 (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)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib/xen/bin/qemu-dm')))\
+(device_model '/usr/lib/xen/bin/qemu-dm')\
+(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\
-(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))\
+(device (vbd (dev 'xvda:disk')(uname 'file:/root/some.img')(mode 'w'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
index e34f27a5269adfe778cda8cbd55cd23fe9be9927..609fddd8ff8f657d77a0f12d12df39b1c341e588 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
index cab2d96337d0e844e1b296c84c50aefc7b5b4432..4e78d585fca9676583e344882a9dd2cf718b3670 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
@@ -3,7 +3,8 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(localtime 0)\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(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-parallel-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
index ce7cfbe59dc17bbe0651f0777af4f2468a278584..549ada303b2280aa1337154c43b2e76c2eee84f5 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel tcp:localhost:9999)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
index 9d77ae95ef9d2b8189ccb8d93c3327662024e942..603108af5add17599a86224743e1bcb71da288d9 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
@@ -4,7 +4,10 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(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')(model 'e1000')(type ioemu))))\
+(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.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
index 5549b5fc0aa4f5cb3d090bc8c6035e350f9289ef..461c505abd057aa232d5da66b573b5739e7d51bf 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
-(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
index ec0d2324998dac3e30788d92fdbe6e174196ef0b..04e21f0321b85c016debe17c31f59458e89f749d 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
@@ -4,7 +4,10 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(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')(model 'e1000')(type ioemu))))\
+(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.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
index eac8291dadbcea5c85ba7efcce08855b1c2de871..82d3211e23c3b714b09efd84979633726bc992c4 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial null)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
index 554d4cccf4143adfc707cd48506450e444fae80e..1c060e98c85e4388c1bb9aa24ef383b12eb41b3e 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
@@ -4,7 +4,10 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(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')(model 'e1000')(type ioemu))))\
+(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.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
index f6673cab960b5558380541deaf3da9323ec11046..67b455419479b3b25a6f1e677be9c55aef5ae79b 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
index dddd0a232eda817f15781f2eef5bfeb1e961c3ec..2b00e77dc23bac079a280e7295d4c256aff68ed3 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial stdio)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
index 90ad630fad345472fe96c379a6aad65188d7698c..79dd27f3f9fdb8e78006e58f94ee703d0f319d40 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
@@ -4,8 +4,10 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial telnet:localhost:9999,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
index a6b6a85c17e79558d67df0d70ad7589042b461c1..cfc457f0828081470e2dda628d92e95cb313027b 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
@@ -4,8 +4,10 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial tcp:localhost:9999,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
index 949b8097edd9389bd323992ba75ad8c7f65c4612..1d68353486b7bb9ad274b97d1cec209bcb1e20a8 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
@@ -4,8 +4,10 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial udp:localhost:9998@localhost:9999)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
index accc3cecbe37350eb49d0b843d20253d48106d3a..e2b423455c53e7670db53f0dfd1f80eb2c821761 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
@@ -4,8 +4,10 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)\
 (serial unix:/tmp/serial.sock,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
index 5109736509c558bfd68bb98af89f3003b60181ba..cba6c9a2878ee9f8ecf754930209c9e589e23428 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial none)\
-(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
index 295c1f62f5f016a21cb95a1e6bc8be299b6fd0c2..4ee94b40b2f59858d89ff0af2aeeb49099614e9f 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(usbdevice mouse)(parallel none)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
index 13fff400a34634eed77e8ec4dff2275fd2bb0fde..efd5e40975e247c37b23811011fffcae17bdbab6 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
index 78ecfb5342574aaef8d8443d185ef40a042cf7e1..5256f08189724ca03abf163aafa586e1fab75f13 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
@@ -3,9 +3,9 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
index 74c4174b4f46d471a5987179e1c99803aefad2e8..25efd9a3b9c56b6ed905b97f96730cbc732a7127 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
@@ -3,9 +3,9 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 1)(keymap 'ja')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv.sexpr b/tests/xml2sexprdata/xml2sexpr-fv.sexpr
index 13fff400a34634eed77e8ec4dff2275fd2bb0fde..efd5e40975e247c37b23811011fffcae17bdbab6 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv.sexpr
@@ -3,8 +3,10 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(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 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
+(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')(type ioemu))))\
+(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
index f595f806d1df9a5292d36fcd4b9bf19d8ea5d66b..a581fa076581b3c42a7ea7f28bf3ef4df0369ac0 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
@@ -4,7 +4,8 @@
 (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)(device (vbd (dev 'xvda')\
+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-e1000.sexpr b/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
index d7367e6baae75548ec2cc0e9e5915f7c48b7f940..4e650d477614d5c5376a95d01ca4fc8bd9aba6f2 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
@@ -4,7 +4,8 @@
 (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)(device (vbd (dev 'xvda')\
+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-routed.sexpr b/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
index d502d4b43f791b7f68328119953ead6ac799f41a..adc2dd0a1781ee2b523b91e4710a80e278e0b1f8 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
@@ -4,7 +4,8 @@
 (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)(device (vbd (dev 'xvda')\
+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-no-source-cdrom.sexpr b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
index d5c05e9697d50887bc0dd0a3e97d71dd5ccc07c5..cff05a8cfab5a1e261d7c6ff4de12152714641a1 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
@@ -3,8 +3,8 @@
 (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)))\
-(localtime 0)\
+(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')(type ioemu))))\
+(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
index 5ab5d31369cb98c6fe51b2e5c5dd011f42a6a433..1ce3c1cd19f293c5476eea9ee278b5f0f557cb40 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
@@ -4,7 +4,7 @@
 (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)(device (vbd (dev 'xvda')\
+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-pv-bootloader-cmdline.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
index 7a3811ea5492872766c0b20cdc50c1a55bddc403..7a592a4f3564831ff3c169ca437186bd0719f8cf 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
@@ -1,6 +1,6 @@
 (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')))\
+(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.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
index 981f105f03bc57afa894447c85a5d91b30dd8e4f..7ecf6d2192b34df314ca100fd23c28aaab2ba942 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
@@ -2,6 +2,6 @@
 (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')\
-(localtime 0)\
+(image (linux (localtime 0)))(localtime 0)\
 (device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w'))))\

diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
index 589bbdfc7099edd7e17c4241a5701c3791121b63..4effc921ba03baa2167892c53f8fc2b84e44723f 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
@@ -1,6 +1,8 @@
 (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')(localtime 1)\
+(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'))))\
+(script 'vif-bridge')))\
+(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 5))))

diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
index 809a7e55ba491299466be60ddfd1fef629859a18..7dba66045ddc9223752ff35cf6949eb6a8ec2900 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
@@ -4,5 +4,6 @@
 (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)(device (vbd (dev 'xvda')\
+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-vfb-new-auto.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
index 70d2edf28a0d64564eec7f8e6091b91861d2fdb9..5d74e9485ec683613742e5a1f8078a6cc026e254 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
@@ -4,7 +4,8 @@
 (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)(device (vbd (dev 'xvda')\
+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.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
index 9bace13db8b5a66a0c4fe3826ebe7ae835754df6..2ba35da7f2be1fe94b9197b4ba71f5fe4703c269 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
@@ -4,7 +4,8 @@
 (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)(device (vbd (dev 'xvda')\
+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.sexpr b/tests/xml2sexprdata/xml2sexpr-pv.sexpr
index 90efcd7d729f752849c40db701ac7862b029944a..ea26f8c57fb50b9006cfa6eecfd6d4cfec132913 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-pv.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv.sexpr
@@ -4,5 +4,6 @@
 (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)(device (vbd (dev 'xvda')\
+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/xml2sexprtest.c b/tests/xml2sexprtest.c
index d884a4bbe0d828a1d42a5cad62079e35e07e679a..246fae09e24b74bd2fb8765f92c5bf8ad6447097 100644 (file)
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -21,7 +21,7 @@ static virCapsPtr caps;
 static virDomainXMLOptionPtr xmlopt;
 
 static int
-testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
+testCompareFiles(const char *xml, const char *sexpr)
 {
   char *gotsexpr = NULL;
   int ret = -1;
@@ -36,7 +36,7 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
       goto fail;
   }
 
-  if (!(gotsexpr = xenFormatSxpr(NULL, def, xendConfigVersion)))
+  if (!(gotsexpr = xenFormatSxpr(NULL, def, 4)))
       goto fail;
 
   if (virtTestCompareToFile(gotsexpr, sexpr) < 0)
@@ -55,7 +55,6 @@ struct testInfo {
     const char *input;
     const char *output;
     const char *name;
-    int version;
 };
 
 static int
@@ -73,7 +72,7 @@ testCompareHelper(const void *data)
         goto cleanup;
     }
 
-    result = testCompareFiles(xml, args, info->version);
+    result = testCompareFiles(xml, args);
 
  cleanup:
     VIR_FREE(xml);
@@ -87,9 +86,9 @@ mymain(void)
 {
     int ret = 0;
 
-#define DO_TEST(in, out, name, version)                                \
+#define DO_TEST(in, out, name)                                         \
     do {                                                               \
-        struct testInfo info = { in, out, name, version };             \
+        struct testInfo info = { in, out, name };                      \
         virResetLastError();                                           \
         if (virtTestRun("Xen XML-2-SEXPR " in " -> " out,              \
                         testCompareHelper, &info) < 0)                 \
@@ -102,64 +101,64 @@ mymain(void)
     if (!(xmlopt = xenDomainXMLConfInit()))
         return EXIT_FAILURE;
 
-    DO_TEST("pv", "pv", "pvtest", 1);
-    DO_TEST("fv", "fv", "fvtest", 1);
-    DO_TEST("pv", "pv", "pvtest", 2);
-    DO_TEST("fv", "fv-v2", "fvtest", 2);
-    DO_TEST("fv-vncunused", "fv-vncunused", "fvtest", 2);
-    DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest", 3);
-    DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto", "pvtest", 3);
-    DO_TEST("pv-bootloader", "pv-bootloader", "pvtest", 1);
-    DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline", "pvtest", 1);
-    DO_TEST("pv-vcpus", "pv-vcpus", "pvtest", 1);
-
-    DO_TEST("disk-file", "disk-file", "pvtest", 2);
-    DO_TEST("disk-block", "disk-block", "pvtest", 2);
-    DO_TEST("disk-block-shareable", "disk-block-shareable", "pvtest", 2);
-    DO_TEST("disk-drv-loop", "disk-drv-loop", "pvtest", 2);
-    DO_TEST("disk-drv-blkback", "disk-drv-blkback", "pvtest", 2);
-    DO_TEST("disk-drv-blktap", "disk-drv-blktap", "pvtest", 2);
-    DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw", "pvtest", 2);
-    DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", "pvtest", 2);
-    DO_TEST("disk-drv-blktap2", "disk-drv-blktap2", "pvtest", 2);
-    DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw", "pvtest", 2);
-
-    DO_TEST("curmem", "curmem", "rhel5", 2);
-    DO_TEST("net-routed", "net-routed", "pvtest", 2);
-    DO_TEST("net-bridged", "net-bridged", "pvtest", 2);
-    DO_TEST("net-e1000", "net-e1000", "pvtest", 2);
-    DO_TEST("bridge-ipaddr", "bridge-ipaddr", "pvtest", 2);
-    DO_TEST("no-source-cdrom", "no-source-cdrom", "test", 2);
-    DO_TEST("pv-localtime", "pv-localtime", "pvtest", 1);
-    DO_TEST("pci-devs", "pci-devs", "pvtest", 2);
-
-    DO_TEST("fv-utc", "fv-utc", "fvtest", 1);
-    DO_TEST("fv-localtime", "fv-localtime", "fvtest", 1);
-    DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest", 1);
-    DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest", 1);
-    DO_TEST("fv-kernel", "fv-kernel", "fvtest", 1);
-    DO_TEST("fv-force-hpet", "fv-force-hpet", "fvtest", 1);
-    DO_TEST("fv-force-nohpet", "fv-force-nohpet", "fvtest", 1);
-
-    DO_TEST("fv-serial-null", "fv-serial-null", "fvtest", 1);
-    DO_TEST("fv-serial-file", "fv-serial-file", "fvtest", 1);
-    DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports", "fvtest", 1);
-    DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port", "fvtest", 1);
-    DO_TEST("fv-serial-stdio", "fv-serial-stdio", "fvtest", 1);
-    DO_TEST("fv-serial-pty", "fv-serial-pty", "fvtest", 1);
-    DO_TEST("fv-serial-pipe", "fv-serial-pipe", "fvtest", 1);
-    DO_TEST("fv-serial-tcp", "fv-serial-tcp", "fvtest", 1);
-    DO_TEST("fv-serial-udp", "fv-serial-udp", "fvtest", 1);
-    DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet", "fvtest", 1);
-    DO_TEST("fv-serial-unix", "fv-serial-unix", "fvtest", 1);
-    DO_TEST("fv-parallel-tcp", "fv-parallel-tcp", "fvtest", 1);
-
-    DO_TEST("fv-sound", "fv-sound", "fvtest", 1);
-
-    DO_TEST("fv-net-netfront", "fv-net-netfront", "fvtest", 1);
-
-    DO_TEST("boot-grub", "boot-grub", "fvtest", 1);
-    DO_TEST("escape", "escape", "fvtest", 1);
+    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-netfront", "fv-net-netfront", "fvtest");
+
+    DO_TEST("boot-grub", "boot-grub", "fvtest");
+    DO_TEST("escape", "escape", "fvtest");
 
     virObjectUnref(caps);
     virObjectUnref(xmlopt);