Convert XenD SEXPR->XML convesion to new domain XML APIs

ChangeLog

@@ -1,3 +1,18 @@
+Fri Jul 25 11:45:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	Convert XenD SEXPR->XML convesion to new domain XML APIs
+
+	* proxy/Makefile.am: Link to domain XML formatting APIs
+	* src/domain_conf.c, src/domain_conf.h: Disable XML parsing
+	routines when used by proxy
+	* src/sexpr.c, src/sexpr.h: Added sexpr_node_copy() API
+	* src/xend_internal.c, src/xend_internal.h: Convert the
+	SEXPR -> XML conversion routines to use the generic domain
+	XML APIs
+	* tests/sexpr2xmltest.c: Adapt for API changes
+	* tests/sexpr2xmldata/*.xml: Update to take account of
+	re-ordering of XML due to new APIs
+
 Fri Jul 25 10:44:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	Remove unused/no-op code from xen drivers

proxy/Makefile.am

@@ -15,6 +15,7 @@ libvirt_proxy_SOURCES = libvirt_proxy.c @top_srcdir@/src/xend_internal.c \
             @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c \
             @top_srcdir@/src/capabilities.c \
             @top_srcdir@/src/memory.c \
+            @top_srcdir@/src/domain_conf.c \
             @top_srcdir@/src/util.c \
 	    @top_srcdir@/src/uuid.c
 libvirt_proxy_LDFLAGS = $(WARN_CFLAGS)

src/domain_conf.c

@@ -439,6 +439,7 @@ void virDomainRemoveInactive(virDomainObjPtr *doms,
     virDomainObjFree(dom);
 }
 
+#ifndef PROXY
 static int virDomainDiskCompare(virDomainDiskDefPtr a,
                                 virDomainDiskDefPtr b) {
     if (a->bus == b->bus)
@@ -1916,7 +1917,7 @@ cleanup:
     xmlXPathFreeContext(ctxt);
     return def;
 }
-
+#endif /* ! PROXY */
 
 /************************************************************************
  *									*
@@ -2695,6 +2696,8 @@ char *virDomainDefFormat(virConnectPtr conn,
 }
 
 
+#ifndef PROXY
+
 int virDomainSaveConfig(virConnectPtr conn,
                         const char *configDir,
                         const char *autostartDir,
@@ -2773,6 +2776,7 @@ int virDomainSaveConfig(virConnectPtr conn,
     return ret;
 }
 
+
 virDomainObjPtr virDomainLoadConfig(virConnectPtr conn,
                                     virCapsPtr caps,
                                     virDomainObjPtr *doms,
@@ -2890,3 +2894,5 @@ int virDomainDeleteConfig(virConnectPtr conn,
 
     return 0;
 }
+
+#endif /* ! PROXY */

src/domain_conf.h

@@ -424,6 +424,7 @@ virDomainObjPtr virDomainAssignDef(virConnectPtr conn,
 void virDomainRemoveInactive(virDomainObjPtr *doms,
                              virDomainObjPtr dom);
 
+#ifndef PROXY
 virDomainDeviceDefPtr virDomainDeviceDefParse(virConnectPtr conn,
                                               const virDomainDefPtr def,
                                               const char *xmlStr);
@@ -437,6 +438,7 @@ virDomainDefPtr virDomainDefParseNode(virConnectPtr conn,
                                       virCapsPtr caps,
                                       xmlDocPtr doc,
                                       xmlNodePtr root);
+#endif
 char *virDomainDefFormat(virConnectPtr conn,
                          virDomainDefPtr def,
                          int flags);

src/sexpr.c

@@ -550,6 +550,21 @@ sexpr_node(const struct sexpr *sexpr, const char *node)
     return (n && n->u.s.car->kind == SEXPR_VALUE) ? n->u.s.car->u.value : NULL;
 }
 
+int sexpr_node_copy(const struct sexpr *sexpr, const char *node, char **dst)
+{
+    const char *val = sexpr_node(sexpr, node);
+
+    if (val) {
+        *dst = strdup(val);
+        if (!(*dst))
+            return -1;
+    } else {
+        *dst = NULL;
+    }
+    return 0;
+}
+
+
 /**
  * sexpr_fmt_node:
  * @sexpr: a pointer to a parsed S-Expression

src/sexpr.h

@@ -47,6 +47,7 @@ void sexpr_free(struct sexpr *sexpr);
 
 /* lookup in S-Expressions */
 const char *sexpr_node(const struct sexpr *sexpr, const char *node);
+int sexpr_node_copy(const struct sexpr *sexpr, const char *node, char **dst);
 const char *sexpr_fmt_node(const struct sexpr *sexpr, const char *fmt, ...)
   ATTRIBUTE_FORMAT(printf,2,3);
 struct sexpr *sexpr_lookup(const struct sexpr *sexpr, const char *node);

src/xend_internal.h

@@ -20,6 +20,7 @@
 
 #include "libvirt/libvirt.h"
 #include "capabilities.h"
+#include "domain_conf.h"
 #include "buf.h"
 
 #ifdef __cplusplus
@@ -100,7 +101,10 @@ char *xenDaemonDomainDumpXMLByName(virConnectPtr xend,
                                   const char *value,
                                   const char *tty);
 
-  char *xend_parse_domain_sexp(virConnectPtr conn,  char *root, int xendConfigVersion);
+virDomainDefPtr
+xenDaemonParseSxprString(virConnectPtr conn,
+                         const char *sexpr,
+                         int xendConfigVersion);
 
   int is_sound_model_valid(const char *model);
   int is_sound_model_conflict(const char *model, const char *soundstr);

tests/sexpr2xmldata/sexpr2xml-curmem.xml

@@ -1,6 +1,9 @@
 <domain type='xen' id='5'>
   <name>rhel5</name>
   <uuid>4f77abd2-3019-58e8-3bab-6fbf2118f880</uuid>
+  <memory>394240</memory>
+  <currentMemory>179200</currentMemory>
+  <vcpu>1</vcpu>
   <bootloader>/usr/bin/pygrub</bootloader>
   <os>
     <type>linux</type>
@@ -8,9 +11,7 @@
     <initrd>/var/lib/xen/initrd.gULTf1</initrd>
     <cmdline>ro root=/dev/VolGroup00/LogVol00 rhgb quiet</cmdline>
   </os>
-  <memory>394240</memory>
+  <clock offset='utc'/>
-  <currentMemory>179200</currentMemory>
-  <vcpu>1</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -21,15 +22,14 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='bridge'>
+      <mac address='00:16:3e:1d:06:15'/>
       <source bridge='xenbr0'/>
       <target dev='vif5.0'/>
-      <mac address='00:16:3e:1d:06:15'/>
-      <script path='vif-bridge'/>
     </interface>
-    <input type='mouse' bus='xen'/>
-    <graphics type='vnc' port='-1'/>
     <console type='pty'>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='xen'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml

@@ -1,10 +1,14 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>49a0c6ff-c066-5392-6498-3632d093c2e7</uuid>
-  <bootloader>/usr/bin/pygrub</bootloader>
   <memory>524288</memory>
   <currentMemory>393216</currentMemory>
   <vcpu>1</vcpu>
+  <bootloader>/usr/bin/pygrub</bootloader>
+  <os>
+    <type>linux</type>
+  </os>
+  <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
@@ -16,10 +20,9 @@
       <shareable/>
     </disk>
     <interface type='bridge'>
+      <mac address='00:16:3e:23:9e:eb'/>
       <source bridge='xenbr0'/>
       <target dev='vif6.0'/>
-      <mac address='00:16:3e:23:9e:eb'/>
-      <script path='vif-bridge'/>
     </interface>
     <console type='pty'>
       <target port='0'/>

tests/sexpr2xmldata/sexpr2xml-disk-block.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>

tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>

tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>

tests/sexpr2xmldata/sexpr2xml-disk-file.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>

tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml

@@ -1,6 +1,9 @@
 <domain type='xen' id='15'>
   <name>fvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
@@ -8,14 +11,10 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
-  <features>
-  </features>
-  <clock offset='utc'/>
   <devices>
     <disk type='file' device='disk'>
       <driver name='file'/>

tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>s10u4</name>
   <uuid>fde0533d-d043-88c6-dfba-4822fa32f309</uuid>
+  <memory>1048576</memory>
+  <currentMemory>1048576</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>1048576</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <pae/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <interface type='ethernet'>

tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='3'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='localtime'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,19 +23,18 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif3.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
+    </interface>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5903' keymap='ja'/>
+    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,24 +23,23 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <parallel type='tcp'>
       <source mode='connect' host='localhost' service='9999'/>
       <protocol type='raw'/>
       <target port='0'/>
     </parallel>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,20 +23,17 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='file'>
       <source path='/tmp/serial.log'/>
       <target port='0'/>
@@ -44,5 +42,7 @@
       <source path='/tmp/serial.log'/>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,25 +23,24 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='null'>
       <target port='0'/>
     </serial>
     <console type='null'>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,20 +23,17 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='pipe'>
       <source path='/tmp/serial.pipe'/>
       <target port='0'/>
@@ -44,5 +42,7 @@
       <source path='/tmp/serial.pipe'/>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,25 +23,24 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>
     <console type='pty'>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,25 +23,24 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='stdio'>
       <target port='0'/>
     </serial>
     <console type='stdio'>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,20 +23,17 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='tcp'>
       <source mode='bind' host='localhost' service='9999'/>
       <protocol type='telnet'/>
@@ -46,5 +44,7 @@
       <protocol type='telnet'/>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,20 +23,17 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='tcp'>
       <source mode='bind' host='localhost' service='9999'/>
       <protocol type='raw'/>
@@ -46,5 +44,7 @@
       <protocol type='raw'/>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,29 +23,28 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='udp'>
-      <source mode='connect' host='localhost' service='9998'/>
       <source mode='bind' host='localhost' service='9999'/>
+      <source mode='connect' host='localhost' service='9998'/>
       <target port='0'/>
     </serial>
     <console type='udp'>
-      <source mode='connect' host='localhost' service='9998'/>
       <source mode='bind' host='localhost' service='9999'/>
+      <source mode='connect' host='localhost' service='9998'/>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='1'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,20 +23,17 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif1.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
-    <input type='mouse' bus='ps2'/>
+    <interface type='bridge'>
-    <graphics type='vnc' port='5901'/>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif1.0'/>
+    </interface>
     <serial type='unix'>
       <source mode='bind' path='/tmp/serial.sock'/>
       <target port='0'/>
@@ -44,5 +42,7 @@
       <source mode='bind' path='/tmp/serial.sock'/>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr

@@ -1 +1 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(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')(acpi 1)(vnc 1)(keymap ja)(soundhw 'idontexit,es1370,all')))(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))))
+(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(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')(acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(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))))

tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='3'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,21 +23,21 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif3.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
+    </interface>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5903' keymap='ja'/>
+    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
     <sound model='sb16'/>
     <sound model='es1370'/>
+    <sound model='pcspk'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr

@@ -1 +1 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(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')(acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370,idontexist,es1370more')))(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))))
+(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(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')(acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))(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))))

tests/sexpr2xmldata/sexpr2xml-fv-sound.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='3'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,20 +23,19 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif3.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
+    </interface>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5903' keymap='ja'/>
+    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
     <sound model='sb16'/>
     <sound model='es1370'/>
   </devices>

tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='3'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,20 +23,19 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif3.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
+    </interface>
     <input type='mouse' bus='usb'/>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5903' keymap='ja'/>
+    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='3'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,20 +23,19 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif3.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
+    </interface>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5903' keymap='ja'/>
+    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-utc.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='3'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,19 +23,18 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif3.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
+    </interface>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5903' keymap='ja'/>
+    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-v2.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='3'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='cdrom'>
@@ -29,12 +30,11 @@
       <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
+      <mac address='00:16:3e:1b:b1:47'/>
       <source bridge='xenbr0'/>
       <target dev='vif3.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
     </interface>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='-1' keymap='ja'/>
+    <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv.xml

@@ -1,20 +1,21 @@
 <domain type='xen' id='3'>
   <name>fvtest</name>
   <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
+  <memory>409600</memory>
+  <currentMemory>409600</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>409600</memory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <features>
     <acpi/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
     <disk type='file' device='disk'>
@@ -22,19 +23,18 @@
       <source file='/root/foo.img'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <interface type='bridge'>
-      <source bridge='xenbr0'/>
-      <target dev='vif3.0'/>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <script path='vif-bridge'/>
-    </interface>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:1b:b1:47'/>
+      <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
+    </interface>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5903' keymap='ja'/>
+    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-net-bridged.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
@@ -19,10 +21,9 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='bridge'>
+      <mac address='00:11:22:33:44:55'/>
       <source bridge='xenbr2'/>
       <target dev='vif6.0'/>
-      <mac address='00:11:22:33:44:55'/>
-      <script path='vif-bridge'/>
     </interface>
     <console type='pty'>
       <target port='0'/>

tests/sexpr2xmldata/sexpr2xml-net-e1000.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
@@ -19,10 +21,9 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='bridge'>
+      <mac address='00:11:22:33:44:55'/>
       <source bridge='xenbr2'/>
       <target dev='vif6.0'/>
-      <mac address='00:11:22:33:44:55'/>
-      <script path='vif-bridge'/>
       <model type='e1000'/>
     </interface>
     <console type='pty'>

tests/sexpr2xmldata/sexpr2xml-net-routed.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
@@ -19,10 +21,10 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='ethernet'>
-      <target dev='vif6.0'/>
       <mac address='00:11:22:33:44:55'/>
       <ip address='172.14.5.6'/>
       <script path='vif-routed'/>
+      <target dev='vif6.0'/>
     </interface>
     <console type='pty'>
       <target port='0'/>

tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml

@@ -1,23 +1,23 @@
 <domain type='xen' id='6'>
   <name>test</name>
   <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid>
+  <memory>391168</memory>
+  <currentMemory>358400</currentMemory>
+  <vcpu>1</vcpu>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev='hd'/>
   </os>
-  <memory>391168</memory>
-  <currentMemory>358400</currentMemory>
-  <vcpu>1</vcpu>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
   <features>
     <acpi/>
     <apic/>
     <pae/>
   </features>
   <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type='block' device='disk'>
@@ -25,22 +25,22 @@
       <source dev='/dev/sda8'/>
       <target dev='hda' bus='ide'/>
     </disk>
-    <disk device='cdrom'>
+    <disk type='file' device='cdrom'>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
+      <mac address='00:16:3e:0a:7b:39'/>
       <source bridge='xenbr0'/>
       <target dev='vif6.0'/>
-      <mac address='00:16:3e:0a:7b:39'/>
     </interface>
-    <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='-1'/>
     <serial type='pty'>
       <target port='0'/>
     </serial>
     <console type='pty'>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml

@@ -1,10 +1,15 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <bootloader>/usr/bin/pypxeboot</bootloader>
   <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args>
-  <memory>430080</memory>
+  <os>
-  <vcpu>2</vcpu>
+    <type>linux</type>
+  </os>
+  <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>

tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
@@ -18,10 +20,10 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
-    <input type='mouse' bus='xen'/>
-    <graphics type='vnc' port='-1' listen='0.0.0.0' keymap='ja'/>
     <console type='pty'>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='xen'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
@@ -18,10 +20,10 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
-    <input type='mouse' bus='xen'/>
-    <graphics type='vnc' port='-1' listen='0.0.0.0' keymap='ja'/>
     <console type='pty'>
       <target port='0'/>
     </console>
+    <input type='mouse' bus='xen'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-pv.xml

@@ -1,14 +1,16 @@
 <domain type='xen' id='6'>
   <name>pvtest</name>
   <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
+  <memory>430080</memory>
+  <currentMemory>430080</currentMemory>
+  <vcpu>2</vcpu>
   <os>
     <type>linux</type>
     <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <memory>430080</memory>
+  <clock offset='utc'/>
-  <vcpu>2</vcpu>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>

tests/sexpr2xmltest.c

@@ -24,19 +24,19 @@ static int testCompareFiles(const char *xml, const char *sexpr,
   char *xmlPtr = &(xmlData[0]);
   char *sexprPtr = &(sexprData[0]);
   int ret = -1;
+  virDomainDefPtr def = NULL;
 
-  if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0) {
+  if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0)
-      printf("Missing %s\n", xml);
       goto fail;
-  }
 
-  if (virtTestLoadFile(sexpr, &sexprPtr, MAX_FILE) < 0) {
+  if (virtTestLoadFile(sexpr, &sexprPtr, MAX_FILE) < 0)
-      printf("Missing %s\n", sexpr);
       goto fail;
-  }
 
-  if (!(gotxml = xend_parse_domain_sexp(NULL, sexprData, xendConfigVersion)))
+  if (!(def = xenDaemonParseSxprString(NULL, sexprData, xendConfigVersion)))
-    goto fail;
+      goto fail;
+
+  if (!(gotxml = virDomainDefFormat(NULL, def, 0)))
+      goto fail;
 
   if (STRNEQ(xmlData, gotxml)) {
       virtTestDifference(stderr, xmlData, gotxml);
@@ -47,6 +47,7 @@ static int testCompareFiles(const char *xml, const char *sexpr,
 
  fail:
   free(gotxml);
+  virDomainDefFree(def);
 
   return ret;
 }
@@ -122,7 +123,7 @@ mymain(int argc, char **argv)
     DO_TEST("fv-utc", "fv-utc", 1);
     DO_TEST("fv-localtime", "fv-localtime", 1);
     DO_TEST("fv-usbmouse", "fv-usbmouse", 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-serial-null", "fv-serial-null", 1);