diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
index 17e723eccd3dbc9b2eee38e5f642b1c5bc5f7ef4..d68782db2832f3aa29a45c6fc93a64cbc8d791f9 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
@@ -12,7 +12,7 @@
   <features>
     <pae/>
   </features>
-  <clock offset='localtime' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='localtime'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
index ded668c7016586fa6137425c99ff83e259900d7c..777f7e08b622b7f3180b6cfbe18b612964cd3dbd 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
@@ -3,7 +3,9 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(boot d)(cdrom '/root/boot.iso')\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
+(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'hda')\
 (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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
index 9494ec2c8f368d8337b527599fa13247349cf0ae..dbfd603d9d88e403317a9004ff05e26ca66f5cc9 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -41,7 +41,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
index d52214f3aba6037442041ccf3f7b9c9ac89c3cbf..04cd2aebf1d40d7ae91ca74a8822246d3f122174 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
@@ -2,8 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
+(acpi 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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))))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
index af1303bc942a87533097f4d3c922bc7522636dc7..8aa3250b8058796154214e9942d7fbb749b0be94 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'>
+  <clock offset='variable' adjustment='0' basis='utc'>
     <timer name='hpet' present='yes'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
@@ -44,7 +44,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
index 75bc8b115a56cee1ac691ad4a354606ffb255245..bcb092650fc32ce19c79aca14494637c12db1b34 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
@@ -2,8 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
+(acpi 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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))))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
index 406f3edba1f8b4690cc7f62b7a4ab4457d02319f..fbf155c9e6bd32f7d36ee80d3076106ec955ea84 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'>
+  <clock offset='variable' adjustment='0' basis='utc'>
     <timer name='hpet' present='no'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
@@ -44,7 +44,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
index 572356420c933de5cb8746902b1366e96291da3f..fcd08dadc76ae2d14157233b62c3de508702b9dc 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
@@ -11,7 +11,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
index 9caf8a0cd7b513ee2e906f1c63219c1d15ab6eb1..5616d19e39709bd1cf6d2bde92c4df3df89d6aba 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
@@ -2,8 +2,9 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)(localtime 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
index bc2ccecc7700976dd860dc91cb26785b31a5c821..1d419799814452f8cff77c56b9ad6cf6b4f8a27c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='localtime' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='localtime'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -41,7 +41,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
index acfc477d6963eb9283f9f767c94fbd8dec1b9e13..b0a344cb4998dca4b504a1512564c4f78cddda1e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
@@ -2,8 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
 (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')(type 'netfront'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
index f92ea4b2cff6b9b28c17cfc1d5ebf3a1dd67d077..c0a78e179228cf6ea27d0ba59b417dd0090811b2 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -42,7 +42,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
index 39a8fbb41a6e37aba87897eb42e7122023592f86..8d017263d6517e5b360119406c72359789ed32b3 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
@@ -2,8 +2,9 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
+(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
 (serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
index 3bc6490ab5f466a08163be80a3d5e57d2d9024c7..1268416695a3d84dce3d594c9daf2e22a013ed7e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -46,7 +46,7 @@
     </parallel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
index 32bf69972e3525a53454f53870c3fbd7c3897348..8f5651813f359e80053a4c29686e6c13a85301dd 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
@@ -5,5 +5,8 @@
 (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')\
-(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
+(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
index d1b51343dfec56e6b33ac19786e7f1303160498a..4c1c5cecb9357c07701a603d2f88113db63cc7d9 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -53,7 +53,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
index ddd94fd1af41327c4a7b077060c7b6b6f019b991..f0b992526e3725e68df5a9ced00dbdc683458b31 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
@@ -2,8 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(usb 1)(parallel none)\
 (serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
index 1c5a0479ca7a4bf2f61527bb1f3d645ded3e00be..8cd0f692c6a9d0b197239deb65afe4688adb0682 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -49,7 +49,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
index 40e02006491330f1e14a14d8b3dd25f98bf4a518..0eac5a4366fa2a0d63b8d9937ed5b4c46f08008c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
@@ -2,8 +2,11 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
+(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')\
-(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
+(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
index 680528e0702c1f8569005eb6f5354d7fc6d070b8..1b7ab298ee7c78922545fbbbb2b1b7b175f65613 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -49,7 +49,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
index 46704686e1fc4ac05031481f2a57b94335583613..a00410cd5310dde2c44db5cb21a779bddfdc5174 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
@@ -2,8 +2,9 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\
+(acpi 1)(usb 1)(parallel none)(serial null)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
index 1a7f866955f53501ec76e46ec96ec43f196ee32b..73361d644f3b613371c705d4a04492affed628ba 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -47,7 +47,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
index 2dacb903d40a7635d2daea1ff7d1b89221fe2ed1..2b3a6610a77204fc8275497a378d69f2a391a9f0 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
@@ -2,8 +2,11 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
+(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')\
-(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
+(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
index b15a1bc6b0abbab70988fe6e13d59436dc6ca6e0..c96df2625be77e864b67d589317c883e45e3c02c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -49,7 +49,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
index 85cf07e4c4c5943cecf6e940360ffdb236280ecc..1029c1a2579739d68b2904557f9230618f5e9a74 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
@@ -2,8 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\
+(acpi 1)(usb 1)(parallel none)(serial pty)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
index e827f1d41e024c4275e30680e6887417599bb8ff..af788fe3ffc06c0dbe5f6159ac472ae31b773148 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -47,7 +47,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
index 6a559e72c131d84a6382f022f2476ff9ca42cedb..05a9a1d918d82f3e33aa4a1a8f66a85b75d5a2b0 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
@@ -2,8 +2,9 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\
+(acpi 1)(usb 1)(parallel none)(serial stdio)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')\
 (type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
index 3d79428df7a9ee6cf9677ff4743a36892e9ddf24..6a2139098268c8f56a7dbc88272ce46d51c9ce5c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -47,7 +47,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
index cda45e438b0c6ee75c6e9ceeb15bbc0e27cb1548..0d80f8acaf6b51af539212a9c0af65789b96ca0c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
@@ -2,9 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(usb 1)(parallel none)\
 (serial telnet:localhost:9999,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
index 7dec0c8fabbfe373af29a219fcc1cb8be58599ec..3033685aab43c92c9e35ede2fbf71ec9c443a32c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -51,7 +51,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
index 94ae80e67f37b5c1aff2e5df4ad298322890788a..44f2bfe8d1b3a9a0157949d71f9864d7bf6f01aa 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
@@ -2,9 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(usb 1)(parallel none)\
 (serial tcp:localhost:9999,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
index 4f4b89b288c5fa8c47ea85bd08aa6dc9ec0e64e6..78fbe97a553c6b92ca145b7799e8ed9c2d2e11e8 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -51,7 +51,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
index 8e1aeb8caa36c3e8235d01ba53a870f9e14be25f..2efedf2e5ecabf154deaba7d8e466bc326dfe791 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
@@ -2,9 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(usb 1)(parallel none)\
 (serial udp:localhost:9998@localhost:9999)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
index cf1fc3beaa7fc0c68770e8a04128b6d9043345e5..f7497f6e24924c8236cc8551a89a73519ced0388 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -51,7 +51,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
index 2bab7224a19cae6ea0559319746686c80d499259..356677e2cbf1fa296531d5c6f830245436109b36 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
@@ -2,9 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(usb 1)(parallel none)\
 (serial unix:/tmp/serial.sock,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
index a1d15f526e6a7941d32e77b7825e6042dbf16a2e..37286094b776069e81ef95ec52e251bfcfe231b1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -49,7 +49,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5901' autoport='no'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
index 6937813372df5e1e79c9d1c15fc4aef832e4e71b..d99e13a7e9e4feda380bcbedc522242cfb1cd80e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
@@ -2,8 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')\
 (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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
index 4311b0cda48535c0538f60fb8a4abd7179109045..823e402490e99bae279d7418aba581c09e5038ea 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -41,7 +41,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <sound model='sb16'/>
     <sound model='es1370'/>
     <memballoon model='xen'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
index ff2266613b708298100a23632e46b6605e41e67a..50d67154e21a40bfec97db4bfc6ce807234fdb5a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
@@ -2,8 +2,9 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
index 4311b0cda48535c0538f60fb8a4abd7179109045..823e402490e99bae279d7418aba581c09e5038ea 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -41,7 +41,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <sound model='sb16'/>
     <sound model='es1370'/>
     <memballoon model='xen'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
index dcc6ab21b28accadbd10308f0947ad7cab5cfa8c..789082ef03785dacf4e41dc776f12c751dc93a6d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
@@ -2,8 +2,9 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
 (acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
index 103cfbe9e7b6da43766f935a2ba18ce05a938549..446b4acee49e5e9cabffc6ea90a8e177a320b210 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -42,7 +42,7 @@
     <input type='mouse' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
index 39e5a72fb030a7525fe8c671ecd2aaa54c1e33b4..e2f77a167ef9a572129ab79276782b42b8deb3f1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
@@ -2,8 +2,9 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
 (acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\
 (device (vbd (dev 'ioemu:hda')(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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
index 728e852b1e7be93e10612ff93d7fd8cd937248c1..c2671f6f86660d40d6e7090426f2b60b00ba4e96 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -42,7 +42,7 @@
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
index c34c7da875b0fa94d0a7727a32a332841439802a..7bfbfaec6ea8f367f89b81e9faba1804da05378d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
@@ -5,5 +5,7 @@
 (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
 (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
 (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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
index 7899baafa03d38abc57afbf2ff57c491d5234af5..3073806249e74b0237a8f4f11ea8445ad9a75382 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -41,7 +41,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
index af5fbe1a2e739564a1b8e948c2a20cab454ce8b7..3073806249e74b0237a8f4f11ea8445ad9a75382 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
index c34c7da875b0fa94d0a7727a32a332841439802a..dc4cbf59f731e319014d5ae657cc89da953d90f6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
@@ -2,8 +2,10 @@
 (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
 (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
 (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')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
index 7899baafa03d38abc57afbf2ff57c491d5234af5..3073806249e74b0237a8f4f11ea8445ad9a75382 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -41,7 +41,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
     <memballoon model='xen'/>
   </devices>
 </domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index 384ff8bfcfb6699adeb3e664ac817847a09c1800..ede6e27bce8970ea1813836de793d57949064984 100644
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index c95de9fcd162f2625f55c41d4d75200c9802bb65..1b42a184ef0ca823c2d2798721a01e50de7223c8 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -20,7 +20,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 *sexprData = NULL;
   char *gotxml = NULL;
@@ -41,20 +41,20 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
 
   memset(&priv, 0, sizeof(priv));
   /* Many puppies died to bring you this code. */
-  priv.xendConfigVersion = xendConfigVersion;
+  priv.xendConfigVersion = 4;
   priv.caps = caps;
   conn->privateData = &priv;
   if (virMutexInit(&priv.lock) < 0)
       goto fail;
 
-  if (xenGetDomIdFromSxprString(sexprData, xendConfigVersion, &id) < 0)
+  if (xenGetDomIdFromSxprString(sexprData, 4, &id) < 0)
       goto fail;
   xenUnifiedLock(&priv);
   tty = xenStoreDomainGetConsolePath(conn, id);
   vncport = xenStoreDomainGetVNCPort(conn, id);
   xenUnifiedUnlock(&priv);
 
-  if (!(def = xenParseSxprString(sexprData, xendConfigVersion,
+  if (!(def = xenParseSxprString(sexprData, 4,
                                  tty, vncport, caps, xmlopt)))
       goto fail;
 
@@ -83,7 +83,6 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
 struct testInfo {
     const char *input;
     const char *output;
-    int version;
 };
 
 static int
@@ -101,7 +100,7 @@ testCompareHelper(const void *data)
         goto cleanup;
     }
 
-    result = testCompareFiles(xml, args, info->version);
+    result = testCompareFiles(xml, args);
 
  cleanup:
     VIR_FREE(xml);
@@ -123,72 +122,72 @@ mymain(void)
         return EXIT_FAILURE;
     }
 
-#define DO_TEST(in, out, version)                                      \
+#define DO_TEST(in, out)                                               \
     do {                                                               \
-        struct testInfo info = { in, out, version };                   \
+        struct testInfo info = { in, out };                            \
         virResetLastError();                                           \
         if (virtTestRun("Xen SEXPR-2-XML " in " -> " out,              \
                         testCompareHelper, &info) < 0)                 \
             ret = -1;                                                  \
     } while (0)
 
-    DO_TEST("pv", "pv", 1);
-    DO_TEST("fv", "fv", 1);
-    DO_TEST("pv", "pv", 2);
-    DO_TEST("fv-v2", "fv-v2", 2);
-    DO_TEST("pv-vfb-new", "pv-vfb-new", 3);
-    DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay", 3);
-    DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash", 3);
-    DO_TEST("fv-autoport", "fv-autoport", 3);
-    DO_TEST("pv-bootloader", "pv-bootloader", 1);
-    DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline", 1);
-    DO_TEST("pv-vcpus", "pv-vcpus", 1);
-
-    DO_TEST("disk-file", "disk-file", 2);
-    DO_TEST("disk-block", "disk-block", 2);
-    DO_TEST("disk-block-shareable", "disk-block-shareable", 2);
-    DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw", 2);
-    DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", 2);
-    DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw", 2);
-
-    DO_TEST("curmem", "curmem", 2);
-    DO_TEST("net-routed", "net-routed", 2);
-    DO_TEST("net-bridged", "net-bridged", 2);
-    DO_TEST("net-e1000", "net-e1000", 2);
-    DO_TEST("bridge-ipaddr", "bridge-ipaddr", 3);
-    DO_TEST("no-source-cdrom", "no-source-cdrom", 2);
-    DO_TEST("pv-localtime", "pv-localtime", 2);
-    DO_TEST("pci-devs", "pci-devs", 2);
-
-    DO_TEST("fv-utc", "fv-utc", 1);
-    DO_TEST("fv-localtime", "fv-localtime", 1);
-    DO_TEST("fv-usbmouse", "fv-usbmouse", 1);
-    DO_TEST("fv-usbtablet", "fv-usbtablet", 1);
-    DO_TEST("fv-kernel", "fv-kernel", 1);
-    DO_TEST("fv-force-hpet", "fv-force-hpet", 1);
-    DO_TEST("fv-force-nohpet", "fv-force-nohpet", 1);
-
-    DO_TEST("fv-serial-null", "fv-serial-null", 1);
-    DO_TEST("fv-serial-file", "fv-serial-file", 1);
-    DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports", 1);
-    DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port", 1);
-    DO_TEST("fv-serial-stdio", "fv-serial-stdio", 1);
-    DO_TEST("fv-serial-pty", "fv-serial-pty", 1);
-    DO_TEST("fv-serial-pipe", "fv-serial-pipe", 1);
-    DO_TEST("fv-serial-tcp", "fv-serial-tcp", 1);
-    DO_TEST("fv-serial-udp", "fv-serial-udp", 1);
-    DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet", 1);
-    DO_TEST("fv-serial-unix", "fv-serial-unix", 1);
-    DO_TEST("fv-parallel-tcp", "fv-parallel-tcp", 1);
-
-    DO_TEST("fv-sound", "fv-sound", 1);
-    DO_TEST("fv-sound-all", "fv-sound-all", 1);
-
-    DO_TEST("fv-net-netfront", "fv-net-netfront", 1);
-
-    DO_TEST("fv-empty-kernel", "fv-empty-kernel", 1);
-
-    DO_TEST("boot-grub", "boot-grub", 1);
+    DO_TEST("pv", "pv");
+    DO_TEST("fv", "fv");
+    DO_TEST("pv", "pv");
+    DO_TEST("fv-v2", "fv-v2");
+    DO_TEST("pv-vfb-new", "pv-vfb-new");
+    DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay");
+    DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash");
+    DO_TEST("fv-autoport", "fv-autoport");
+    DO_TEST("pv-bootloader", "pv-bootloader");
+    DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline");
+    DO_TEST("pv-vcpus", "pv-vcpus");
+
+    DO_TEST("disk-file", "disk-file");
+    DO_TEST("disk-block", "disk-block");
+    DO_TEST("disk-block-shareable", "disk-block-shareable");
+    DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw");
+    DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow");
+    DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw");
+
+    DO_TEST("curmem", "curmem");
+    DO_TEST("net-routed", "net-routed");
+    DO_TEST("net-bridged", "net-bridged");
+    DO_TEST("net-e1000", "net-e1000");
+    DO_TEST("bridge-ipaddr", "bridge-ipaddr");
+    DO_TEST("no-source-cdrom", "no-source-cdrom");
+    DO_TEST("pv-localtime", "pv-localtime");
+    DO_TEST("pci-devs", "pci-devs");
+
+    DO_TEST("fv-utc", "fv-utc");
+    DO_TEST("fv-localtime", "fv-localtime");
+    DO_TEST("fv-usbmouse", "fv-usbmouse");
+    DO_TEST("fv-usbtablet", "fv-usbtablet");
+    DO_TEST("fv-kernel", "fv-kernel");
+    DO_TEST("fv-force-hpet", "fv-force-hpet");
+    DO_TEST("fv-force-nohpet", "fv-force-nohpet");
+
+    DO_TEST("fv-serial-null", "fv-serial-null");
+    DO_TEST("fv-serial-file", "fv-serial-file");
+    DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports");
+    DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port");
+    DO_TEST("fv-serial-stdio", "fv-serial-stdio");
+    DO_TEST("fv-serial-pty", "fv-serial-pty");
+    DO_TEST("fv-serial-pipe", "fv-serial-pipe");
+    DO_TEST("fv-serial-tcp", "fv-serial-tcp");
+    DO_TEST("fv-serial-udp", "fv-serial-udp");
+    DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet");
+    DO_TEST("fv-serial-unix", "fv-serial-unix");
+    DO_TEST("fv-parallel-tcp", "fv-parallel-tcp");
+
+    DO_TEST("fv-sound", "fv-sound");
+    DO_TEST("fv-sound-all", "fv-sound-all");
+
+    DO_TEST("fv-net-netfront", "fv-net-netfront");
+
+    DO_TEST("fv-empty-kernel", "fv-empty-kernel");
+
+    DO_TEST("boot-grub", "boot-grub");
 
     virObjectUnref(caps);
     virObjectUnref(xmlopt);