[libvirt] [PATCHv2 3/3] Xen: Adapt <clock> tests

Philipp Hahn hahn at univention.de
Wed Feb 8 18:23:07 UTC 2012


"localtime = 0" is always inserted, because otherwise on updates the
value is not changed within XenD.

Some statements change their order becaus code was moved around.

Signed-off-by: Philipp Hahn <hahn at univention.de>
---
 tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg     |    1 +
 tests/xmconfigdata/test-fullvirt-force-hpet.cfg    |    2 +-
 tests/xmconfigdata/test-fullvirt-force-nohpet.cfg  |    2 +-
 tests/xmconfigdata/test-fullvirt-old-cdrom.cfg     |    2 +-
 tests/xmconfigdata/test-paravirt-net-e1000.cfg     |    1 +
 tests/xmconfigdata/test-paravirt-net-vifname.cfg   |    1 +
 .../test-paravirt-new-pvfb-vncdisplay.cfg          |    1 +
 tests/xmconfigdata/test-paravirt-new-pvfb.cfg      |    1 +
 .../test-paravirt-old-pvfb-vncdisplay.cfg          |    1 +
 tests/xmconfigdata/test-paravirt-old-pvfb.cfg      |    1 +
 tests/xmconfigdata/test-paravirt-vcpu.cfg          |    1 +
 tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr      |    1 +
 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr  |    4 +++-
 tests/xml2sexprdata/xml2sexpr-curmem.sexpr         |    1 +
 .../xml2sexpr-disk-block-shareable.sexpr           |    4 +++-
 tests/xml2sexprdata/xml2sexpr-disk-block.sexpr     |    4 +++-
 .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr |    4 +++-
 .../xml2sexpr-disk-drv-blktap-qcow.sexpr           |    4 +++-
 .../xml2sexpr-disk-drv-blktap-raw.sexpr            |    4 +++-
 .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr  |    4 +++-
 .../xml2sexpr-disk-drv-blktap2-raw.sexpr           |    4 +++-
 .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr |    4 +++-
 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr  |    4 +++-
 tests/xml2sexprdata/xml2sexpr-disk-file.sexpr      |    4 +++-
 tests/xml2sexprdata/xml2sexpr-escape.sexpr         |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr  |    1 +
 .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr  |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr      |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr   |    5 +++--
 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr   |    3 ++-
 .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr  |    3 ++-
 .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr  |    1 +
 .../xml2sexpr-fv-serial-dev-2-ports.sexpr          |    3 ++-
 .../xml2sexpr-fv-serial-dev-2nd-port.sexpr         |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr |    3 ++-
 tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr |    3 ++-
 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr  |    1 +
 .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr  |    1 +
 .../xml2sexpr-fv-serial-tcp-telnet.sexpr           |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr  |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr  |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr       |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr    |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr   |    3 ++-
 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr         |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr          |    1 +
 tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr   |    3 ++-
 tests/xml2sexprdata/xml2sexpr-fv.sexpr             |    1 +
 tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr    |    2 +-
 tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr      |    2 +-
 tests/xml2sexprdata/xml2sexpr-net-routed.sexpr     |    2 +-
 .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr  |    1 +
 tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr       |    2 +-
 .../xml2sexpr-pv-bootloader-cmdline.sexpr          |    1 +
 tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr  |    4 +++-
 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr       |    2 +-
 .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr  |    2 +-
 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr     |    2 +-
 tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr    |    1 +
 tests/xml2sexprdata/xml2sexpr-pv.sexpr             |    2 +-
 62 files changed, 95 insertions(+), 32 deletions(-)

diff --git a/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg b/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg
index b8570f2..c9abadd 100644
--- a/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg
+++ b/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg
@@ -5,6 +5,7 @@ memory = 420
 vcpus = 2
 bootloader = "/usr/bin/pypxeboot"
 bootargs = "mac=AA:00:86:e2:35:72"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
 on_crash = "destroy"
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
index 4dd7585..178aecd 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
@@ -9,8 +9,8 @@ boot = "d"
 pae = 1
 acpi = 1
 apic = 1
-localtime = 0
 hpet = 1
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
index d4fb429..44f5ac7 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
@@ -9,8 +9,8 @@ boot = "d"
 pae = 1
 acpi = 1
 apic = 1
-localtime = 0
 hpet = 0
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
index 4ec862c..5d2ab81 100755
--- a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
+++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
@@ -9,8 +9,8 @@ boot = "d"
 pae = 1
 acpi = 1
 apic = 1
-localtime = 0
 cdrom = "/root/boot.iso"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.cfg b/tests/xmconfigdata/test-paravirt-net-e1000.cfg
index 591f2ab..bcc16fb 100755
--- a/tests/xmconfigdata/test-paravirt-net-e1000.cfg
+++ b/tests/xmconfigdata/test-paravirt-net-e1000.cfg
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.cfg b/tests/xmconfigdata/test-paravirt-net-vifname.cfg
index 3d685ca..98ce75b 100644
--- a/tests/xmconfigdata/test-paravirt-net-vifname.cfg
+++ b/tests/xmconfigdata/test-paravirt-net-vifname.cfg
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
index 881ed2b..633552c 100644
--- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.cfg b/tests/xmconfigdata/test-paravirt-new-pvfb.cfg
index 8f5e9aa..8b56e19 100755
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.cfg
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.cfg
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
index 15134ea..eea3365 100644
--- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg
index b190294..ed9c771 100755
--- a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xmconfigdata/test-paravirt-vcpu.cfg b/tests/xmconfigdata/test-paravirt-vcpu.cfg
index d0844f5..2ac0f79 100644
--- a/tests/xmconfigdata/test-paravirt-vcpu.cfg
+++ b/tests/xmconfigdata/test-paravirt-vcpu.cfg
@@ -5,6 +5,7 @@ memory = 394
 vcpus = 4
 vcpu_avail = 3
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
index 88c0f68..4850bc0 100644
--- a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
@@ -2,4 +2,5 @@
 (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)\
 (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 56ff525..47c4a3e 100644
--- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
@@ -4,7 +4,9 @@
 (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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w')))\
 (device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
 (script 'vif-bridge')(ip '192.0.2.1'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
index e7149b3..89d48b2 100644
--- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
@@ -1,6 +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)\
 (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 b8387e5..dd03f7b 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
@@ -2,6 +2,8 @@
 (uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')\
 (on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
 (image (linux (args 'ro root=/dev/VolGroup00/LogVol00')))\
+(localtime 0)\
 (device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\
-(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\
+(mode 'w!')))\
+(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\
 (script 'vif-bridge'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
index 960801a..b04c618 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
@@ -4,5 +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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 960801a..b04c618 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
@@ -4,5 +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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 1e1b381..6341d04 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
@@ -4,5 +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  ')))(device (tap (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 6b66e43..6a6a43a 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
@@ -4,5 +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  ')))(device (tap (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 6b66e43..6a6a43a 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
@@ -4,5 +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  ')))(device (tap (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 1e79bcf..b1caabb 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
@@ -4,5 +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  ')))(device (tap2 (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 1e79bcf..b1caabb 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
@@ -4,5 +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  ')))(device (tap2 (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 dac0aa3..8bf6d7a 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
@@ -4,5 +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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 dac0aa3..8bf6d7a 100644
--- a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
@@ -4,5 +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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(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 7b29131..7f70adb 100644
--- a/tests/xml2sexprdata/xml2sexpr-escape.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-escape.sexpr
@@ -7,4 +7,5 @@
 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'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
index 400872d..e1486b5 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
index 9577892..a396cea 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
index 4950832..edaa775 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
@@ -7,4 +7,5 @@
 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')))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
index 4f91119..3ba7e96 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
@@ -1,9 +1,10 @@
 (vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')(localtime 1)\
+(on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
-(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 1)\
 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr
index 71df15b..20f9228 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr
@@ -3,6 +3,7 @@
 (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 (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
index 7fe2544..cab2d96 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
@@ -3,6 +3,7 @@
 (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 (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(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')(type netfront))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
index 38504b1..14c5e5e 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
 (serial none)(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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
index f3bfbd7..16dcbf2 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
index 9ecbbe0..45a7585 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial (none /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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
index be40218..90bd2b5 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
index 40243a7..09f4a33 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\
 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
index 4e2dc78..a620016 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
index 7ae9315..9ad9d42 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\
 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
index 8369bb4..9fc7837 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\
 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
index 40120cf..337ad51 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
@@ -5,6 +5,7 @@
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial telnet:localhost:9999,server,nowait)\
 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
index 7938a7b..e77ed9f 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
@@ -5,6 +5,7 @@
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial tcp:localhost:9999,server,nowait)\
 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
index 3c19f25..bb7487e 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
@@ -5,6 +5,7 @@
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial udp:localhost:9998 at localhost:9999)\
 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
index 67ceeaa..3686f42 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
@@ -5,6 +5,7 @@
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial unix:/tmp/serial.sock,server,nowait)\
 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
index 4c37c35..c00f833 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
 (soundhw 'sb16,es1370')(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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
index c0ad2bc..e8733dc 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(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')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
index ff1c695..6a192bb 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
@@ -3,7 +3,8 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
+(rtc_timeoffset 0)(localtime 0)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (type ioemu))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
index 81fb92d..b39c832 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(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')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
index b27e990..78ecfb5 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
@@ -4,6 +4,7 @@
 (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')))\
+(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')\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
index 908ae94..74c4174 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.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)(vncunused 1)(keymap 'ja')))(device (vbd (dev 'hda:disk')\
+(vnc 1)(vncunused 1)(keymap 'ja')))\
+(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')\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv.sexpr b/tests/xml2sexprdata/xml2sexpr-fv.sexpr
index 81fb92d..b39c832 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv.sexpr
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(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')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
index 0c0c62e..f595f80 100644
--- a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-net-bridged.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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(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 d95ed82..d7367e6 100644
--- a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-net-e1000.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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(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 3430e31..d502d4b 100644
--- a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-net-routed.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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(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 eeebee3..d5c05e9 100644
--- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
@@ -4,6 +4,7 @@
 (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 (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))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
index fdc48cf..5ab5d31 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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(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 236017e..7a3811e 100644
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
@@ -2,4 +2,5 @@
 (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\
 (bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\
 (on_crash 'destroy')(image (linux (args 'xenfb.video=8,1280,1024')))\
+(localtime 0)\
 (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 c11938e..981f105 100644
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
@@ -1,5 +1,7 @@
 (vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
 (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\
 (bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')\
+(on_reboot 'destroy')(on_crash 'destroy')\
+(localtime 0)\
+(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
index df854ca..809a7e5 100644
--- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
@@ -4,5 +4,5 @@
 (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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(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 5eb0133..70d2edf 100644
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(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 c74098f..9bace13 100644
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
 (device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\
 (vncpasswd '123456')(keymap 'ja'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
index 1e22b83..c2c1290 100644
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
@@ -6,4 +6,5 @@
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
 core/test/5.91/x86_64/os  ')(vnc 1)(vncunused 0)(vncdisplay 6)\
 (vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))\
+(localtime 0)\
 (device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv.sexpr b/tests/xml2sexprdata/xml2sexpr-pv.sexpr
index dac0aa3..90efcd7 100644
--- a/tests/xml2sexprdata/xml2sexpr-pv.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-pv.sexpr
@@ -4,5 +4,5 @@
 (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  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w'))))\
-- 
1.7.1




More information about the libvir-list mailing list