[libvirt] [PATCH 11/16] Xen: tests: use latest XEND_CONFIG_VERSION in xml2sexpr tests
Jim Fehlig
jfehlig at suse.com
Tue Dec 15 21:33:08 UTC 2015
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 at suse.com>
---
tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 4 +-
tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 2 +-
tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 2 +-
.../xml2sexpr-disk-block-shareable.sexpr | 2 +-
tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 2 +-
.../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 2 +-
.../xml2sexpr-disk-drv-blktap-qcow.sexpr | 2 +-
.../xml2sexpr-disk-drv-blktap-raw.sexpr | 2 +-
.../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 2 +-
.../xml2sexpr-disk-drv-blktap2-raw.sexpr | 2 +-
.../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 2 +-
tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 2 +-
tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 2 +-
tests/xml2sexprdata/xml2sexpr-escape.sexpr | 6 +-
tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 8 +-
.../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 5 +-
tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 8 +-
.../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 5 +-
.../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 8 +-
.../xml2sexpr-fv-serial-dev-2-ports.sexpr | 11 +-
.../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 11 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 11 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 8 +-
.../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 8 +-
.../xml2sexpr-fv-serial-tcp-telnet.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 4 +-
tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 4 +-
tests/xml2sexprdata/xml2sexpr-fv.sexpr | 8 +-
tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 3 +-
tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 3 +-
tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 3 +-
.../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 6 +-
tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +-
.../xml2sexpr-pv-bootloader-cmdline.sexpr | 2 +-
tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 2 +-
tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr | 6 +-
tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 3 +-
.../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 3 +-
tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 3 +-
tests/xml2sexprdata/xml2sexpr-pv.sexpr | 3 +-
tests/xml2sexprtest.c | 113 ++++++++++-----------
50 files changed, 208 insertions(+), 157 deletions(-)
diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
index 4850bc0..923d282 100644
--- 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 47c4a3e..6830507 100644
--- 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 89d48b2..4b9fbb3 100644
--- 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 dd03f7b..e013136 100644
--- 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 b04c618..ce1fd23 100644
--- 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 b04c618..ce1fd23 100644
--- 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 6341d04..d44de4f 100644
--- 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 6a6a43a..47e0036 100644
--- 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 6a6a43a..47e0036 100644
--- 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 b1caabb..bc6c923 100644
--- 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 b1caabb..bc6c923 100644
--- 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 8bf6d7a..be7ce1a 100644
--- 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 8bf6d7a..be7ce1a 100644
--- 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 7f70adb..3c2ab8c 100644
--- 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 096229f..a6dcf1d 100644
--- 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 f9c5831..ffa3361 100644
--- 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 edaa775..e2c1595 100644
--- 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 e34f27a..609fddd 100644
--- 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 cab2d96..4e78d58 100644
--- 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 ce7cfbe..549ada3 100644
--- 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 9d77ae9..603108a 100644
--- 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 5549b5f..461c505 100644
--- 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 ec0d232..04e21f0 100644
--- 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 eac8291..82d3211 100644
--- 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 554d4cc..1c060e9 100644
--- 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 f6673ca..67b4554 100644
--- 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 dddd0a2..2b00e77 100644
--- 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 90ad630..79dd27f 100644
--- 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 a6b6a85..cfc457f 100644
--- 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 949b809..1d68353 100644
--- 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 at 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 accc3ce..e2b4234 100644
--- 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 5109736..cba6c9a 100644
--- 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 295c1f6..4ee94b4 100644
--- 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 13fff40..efd5e40 100644
--- 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 78ecfb5..5256f08 100644
--- 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 74c4174..25efd9a 100644
--- 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 13fff40..efd5e40 100644
--- 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 f595f80..a581fa0 100644
--- 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 d7367e6..4e650d4 100644
--- 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 d502d4b..adc2dd0 100644
--- 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 d5c05e9..cff05a8 100644
--- 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 5ab5d31..1ce3c1c 100644
--- 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 7a3811e..7a592a4 100644
--- 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 981f105..7ecf6d2 100644
--- 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 589bbdf..4effc92 100644
--- 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 809a7e5..7dba660 100644
--- 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 70d2edf..5d74e94 100644
--- 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 9bace13..2ba35da 100644
--- 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 90efcd7..ea26f8c 100644
--- 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 d884a4b..246fae0 100644
--- 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("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", 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("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", 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("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", 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-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", 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-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", 1);
+ DO_TEST("fv-sound", "fv-sound", "fvtest");
- DO_TEST("fv-net-netfront", "fv-net-netfront", "fvtest", 1);
+ DO_TEST("fv-net-netfront", "fv-net-netfront", "fvtest");
- DO_TEST("boot-grub", "boot-grub", "fvtest", 1);
- DO_TEST("escape", "escape", "fvtest", 1);
+ DO_TEST("boot-grub", "boot-grub", "fvtest");
+ DO_TEST("escape", "escape", "fvtest");
virObjectUnref(caps);
virObjectUnref(xmlopt);
--
2.1.4
More information about the libvir-list
mailing list