xen: use virDomainDefPostParse for parsing XM/XL/SEXPR cofings

This change ensures to call driver specific post-parse code to modify
domain definition after parsing hypervisor config the same way we do
after parsing XML.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 35d7fae892a60db6519468eddeeb541dc47058ff..e3d2eaf06734b6e1ba26328652b04b6a97fb3592 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -2587,6 +2587,7 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn,
             goto cleanup;
         if (!(def = xenParseXL(conf,
                                cfg->caps,
+                               driver->xmlopt,
                                cfg->verInfo->xen_version_major)))
             goto cleanup;
     } else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_XM)) {
@@ -2595,14 +2596,17 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn,
 
         if (!(def = xenParseXM(conf,
                                cfg->verInfo->xen_version_major,
-                               cfg->caps)))
+                               cfg->caps,
+                               driver->xmlopt)))
             goto cleanup;
     } else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_SEXPR)) {
         /* only support latest xend config format */
         if (!(def = xenParseSxprString(nativeConfig,
                                        XEND_CONFIG_VERSION_3_1_0,
                                        NULL,
-                                       -1))) {
+                                       -1,
+                                       cfg->caps,
+                                       driver->xmlopt))) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("parsing sxpr config failed"));
             goto cleanup;

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index ce31f0f883d8945e75debd43784fe6d70386f4d1..285a553ec0c6f61f2625855c08ec981569bd36e2 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -1645,7 +1645,8 @@ xenUnifiedConnectDomainXMLFromNative(virConnectPtr conn,
         if (!conf)
             goto cleanup;
 
-        def = xenParseXM(conf, priv->xendConfigVersion, priv->caps);
+        def = xenParseXM(conf, priv->xendConfigVersion,
+                         priv->caps, priv->xmlopt);
     } else if (STREQ(format, XEN_CONFIG_FORMAT_SEXPR)) {
         if (xenGetDomIdFromSxprString(config, priv->xendConfigVersion, &id) < 0)
             goto cleanup;
@@ -1654,7 +1655,7 @@ xenUnifiedConnectDomainXMLFromNative(virConnectPtr conn,
         vncport = xenStoreDomainGetVNCPort(conn, id);
         xenUnifiedUnlock(priv);
         def = xenParseSxprString(config, priv->xendConfigVersion, tty,
-                                       vncport);
+                                 vncport, priv->caps, priv->xmlopt);
     }
     if (!def)
         goto cleanup;

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 75f98b14e5f42038301f8b9757bc5bf4e28e1cc3..00c63d328641cdfa538ad2a1fb6ba436ff73a343 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -139,7 +139,7 @@ xenXMConfigReadFile(virConnectPtr conn, const char *filename)
     if (!(conf = virConfReadFile(filename, 0)))
         return NULL;
 
-    def = xenParseXM(conf, priv->xendConfigVersion, priv->caps);
+    def = xenParseXM(conf, priv->xendConfigVersion, priv->caps, priv->xmlopt);
     virConfFree(conf);
 
     return def;

diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 7fc9c9d24ffbe2fdbb3fdc4dd69c01ba6eefb8db..f9a3187f97b70717b9baa599dc794501d60a7979 100644 (file)
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1491,7 +1491,11 @@ xenParseSxpr(const struct sexpr *root,
  */
 virDomainDefPtr
 xenParseSxprString(const char *sexpr,
-                         int xendConfigVersion, char *tty, int vncport)
+                   int xendConfigVersion,
+                   char *tty,
+                   int vncport,
+                   virCapsPtr caps,
+                   virDomainXMLOptionPtr xmlopt)
 {
     struct sexpr *root = string2sexpr(sexpr);
     virDomainDefPtr def;
@@ -1499,8 +1503,16 @@ xenParseSxprString(const char *sexpr,
     if (!root)
         return NULL;
 
-    def = xenParseSxpr(root, xendConfigVersion, NULL, tty, vncport);
+    if (!(def = xenParseSxpr(root, xendConfigVersion, NULL, tty, vncport)))
+        goto cleanup;
 
+    if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+                              xmlopt) < 0) {
+        virDomainDefFree(def);
+        def = NULL;
+    }
+
+ cleanup:
     sexpr_free(root);
 
     return def;

diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index f354a50db727293f342a8606941e5a4f56b7498b..e42a93175148f866747f2129e4c5ba258ff34b5e 100644 (file)
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -43,8 +43,12 @@ typedef enum {
 int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion, int *id);
 int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion, int *id);
 
-virDomainDefPtr xenParseSxprString(const char *sexpr, int xendConfigVersion,
-                                   char *tty, int vncport);
+virDomainDefPtr xenParseSxprString(const char *sexpr,
+                                   int xendConfigVersion,
+                                   char *tty,
+                                   int vncport,
+                                   virCapsPtr caps,
+                                   virDomainXMLOptionPtr xmlopt);
 
 virDomainDefPtr xenParseSxpr(const struct sexpr *root, int xendConfigVersion,
                              const char *cpus, char *tty, int vncport);

diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c
index 0cb88cbcbdc054394ed660d69911bdee05610ded..98e345c8b86cf430747dfb0062baefd9a185571f 100644 (file)
--- a/src/xenconfig/xen_xl.c
+++ b/src/xenconfig/xen_xl.c
@@ -444,7 +444,10 @@ xenParseXLInputDevs(virConfPtr conf, virDomainDefPtr def)
 }
 
 virDomainDefPtr
-xenParseXL(virConfPtr conf, virCapsPtr caps, int xendConfigVersion)
+xenParseXL(virConfPtr conf,
+           virCapsPtr caps,
+           virDomainXMLOptionPtr xmlopt,
+           int xendConfigVersion)
 {
     virDomainDefPtr def = NULL;
 
@@ -469,6 +472,10 @@ xenParseXL(virConfPtr conf, virCapsPtr caps, int xendConfigVersion)
     if (xenParseXLInputDevs(conf, def) < 0)
         goto cleanup;
 
+    if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+                              xmlopt) < 0)
+        goto cleanup;
+
     return def;
 
  cleanup:

diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h
index 9838297418925a2bc3fc9a6c05adb1ff3e4b6093..58dfcb5478e0a390d7fd187b65500e9563995a3c 100644 (file)
--- a/src/xenconfig/xen_xl.h
+++ b/src/xenconfig/xen_xl.h
@@ -27,7 +27,9 @@
 # include "domain_conf.h"
 # include "xen_common.h"
 
-virDomainDefPtr xenParseXL(virConfPtr conn, virCapsPtr caps,
+virDomainDefPtr xenParseXL(virConfPtr conn,
+                           virCapsPtr caps,
+                           virDomainXMLOptionPtr xmlopt,
                            int xendConfigVersion);
 virConfPtr xenFormatXL(virDomainDefPtr def,
                        virConnectPtr, int xendConfigVersion);

diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
index a4d1203fe1d53003b470cb048c82f406e282c8ac..13eedf1e35e75a1accbf19f3c3e4066ca8c005e3 100644 (file)
--- a/src/xenconfig/xen_xm.c
+++ b/src/xenconfig/xen_xm.c
@@ -469,7 +469,8 @@ xenParseXMInputDevs(virConfPtr conf, virDomainDefPtr def)
 virDomainDefPtr
 xenParseXM(virConfPtr conf,
            int xendConfigVersion,
-           virCapsPtr caps)
+           virCapsPtr caps,
+           virDomainXMLOptionPtr xmlopt)
 {
     virDomainDefPtr def = NULL;
 
@@ -491,6 +492,10 @@ xenParseXM(virConfPtr conf,
     if (xenParseXMInputDevs(conf, def) < 0)
          goto cleanup;
 
+    if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+                              xmlopt) < 0)
+        goto cleanup;
+
     return def;
 
  cleanup:

diff --git a/src/xenconfig/xen_xm.h b/src/xenconfig/xen_xm.h
index 629a4b32632dbe3eee8198b682fc1c95d0241569..61f94db8ae31c1c9570878f55f970dcfba64e5a0 100644 (file)
--- a/src/xenconfig/xen_xm.h
+++ b/src/xenconfig/xen_xm.h
@@ -34,6 +34,6 @@ virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def,
                        int xendConfigVersion);
 
 virDomainDefPtr xenParseXM(virConfPtr conf, int xendConfigVersion,
-                           virCapsPtr caps);
+                           virCapsPtr caps, virDomainXMLOptionPtr xmlopt);
 
 #endif /* __VIR_XEN_XM_H__ */

diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
index 1220407f3449d579a0459ad2b275c1c87ed9ad3f..ebce566929113deea2effa9ec3016ad45087b67f 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
@@ -23,5 +23,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
index 25a29fd85cb661f8842bc2b749678aacdd03ed34..04445249ac8c279e16ab445ffd310dcfdad362bf 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
@@ -31,5 +31,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
index 39d954a223564b38c3e6672131b0cceab03031fc..4ac263ed1fdbc505bd3eae5a902b537a0bd9cb38 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
@@ -34,5 +34,6 @@
     <input type='mouse' bus='xen'/>
     <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
index 40e890390c7f297a3dbc402e4d43bf201eaa2421..18c7f4d36840a80f5cd1b440555783927fb549f8 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
@@ -29,5 +29,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
index 51e3b3a9d258b27a8cba3c03feb40864255a7439..cce8af1a4e8e8b168e22cdc1e9ba1b21b9ae3fa1 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
index 315c68a647b0ff48cd24ccdcb3ec472e704b89c8..c61c0464a741214573d7c7de33c23d14faf64d7d 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
index c56582da5b159429f96c36405ff0d453bdc2bc01..227e3bf1ab3febc8d531a01e69dd78916a739827 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
index 7afc6b50cbf4246a2d58ad1b5e5356e62fa956f6..f74712b28f90a822f123e1ec93da4886d0e0f32d 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
index 36b8c1eb6b395a601614cfba4fc76910332c3671..895605b254c72fbe0e02c3bbc272e9f9a23988a4 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
index 761952cecbacd5f1ff23c0d444d1256270d1913f..17e723eccd3dbc9b2eee38e5f642b1c5bc5f7ef4 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
@@ -23,6 +23,7 @@
       <source dev='/iscsi/winxp'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:e8:18'/>
@@ -47,5 +49,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
index 2898098db26bde7d97c4661329434fb8e30382ab..9494ec2c8f368d8337b527599fa13247349cf0ae 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -40,5 +42,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
index a0fe30dd01a43f66cf52562b60670728bdfd1379..af1303bc942a87533097f4d3c922bc7522636dc7 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
@@ -25,6 +25,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -32,6 +33,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -43,5 +45,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
index 851797da678ea79364f597fd7bdd16d8098a2fd7..406f3edba1f8b4690cc7f62b7a4ab4457d02319f 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
@@ -25,6 +25,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -32,6 +33,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -43,5 +45,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
index 09cfe19e81f50e735123c4d4b5b0031a86b01076..572356420c933de5cb8746902b1366e96291da3f 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
@@ -28,5 +28,6 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
index 44c0f616229038718e88d5638a302863c0a76b98..4f2a39b804b0bd78f0aebea0e18381ab68f8fb77 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
@@ -28,8 +28,10 @@
       <source dev='/dev/zvol/dsk/export/s10u4-root'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' keymap='en-us'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
index 29007f03874abcd12a6b2752daee4c2e3f4ee2d8..bc2ccecc7700976dd860dc91cb26785b31a5c821 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -40,5 +42,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
index 3dbc999ce168f872167fc88984bccb9c28fcd837..ec75365b1fcb2acf7b4d3fe0de15c3311a62c6ee 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -41,5 +43,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
index d96350ebe2b99df1d1ff63e0da1c25791a6f1623..f92ea4b2cff6b9b28c17cfc1d5ebf3a1dd67d077 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -41,5 +43,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
index 7ad377c0513b659ede41f769a27d609fe420c618..3bc6490ab5f466a08163be80a3d5e57d2d9024c7 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -45,5 +47,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
index adba6cba316491e4af97a45410fe4b577c635c3d..d1b51343dfec56e6b33ac19786e7f1303160498a 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -52,5 +54,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
index b6c36018db817d96f2bd88bb4863b7167351eb15..1c5a0479ca7a4bf2f61527bb1f3d645ded3e00be 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -48,5 +50,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
index dabe679d7be7b8c2158bb8f580e3f2dfa490b67c..680528e0702c1f8569005eb6f5354d7fc6d070b8 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -48,5 +50,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
index fb19d740de15220c9797638c4b229b6741462cd1..1a7f866955f53501ec76e46ec96ec43f196ee32b 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -46,5 +48,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
index 5aa425b32130956491812ccbf659ed2de1f36aaa..b15a1bc6b0abbab70988fe6e13d59436dc6ca6e0 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -48,5 +50,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
index 3c2ca210973a402c47959368afa683d2b8e1c818..e827f1d41e024c4275e30680e6887417599bb8ff 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -46,5 +48,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
index 160edbdb6c5dd3f329057d19abe88bce51181a3d..3d79428df7a9ee6cf9677ff4743a36892e9ddf24 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -46,5 +48,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
index 4396efc4266b254fa645a5e44b7265680ac1923f..7dec0c8fabbfe373af29a219fcc1cb8be58599ec 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -50,5 +52,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
index 3d17b5865742bbcdfb90bf73a01861a6aef1ef73..4f4b89b288c5fa8c47ea85bd08aa6dc9ec0e64e6 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -50,5 +52,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
index fc3d457f3c561f7afedac70769d8a89d02beadf9..cf1fc3beaa7fc0c68770e8a04128b6d9043345e5 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -50,5 +52,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
index 14b54f1b0ef8cb4fdaf05b0cdb0925302e842a7b..a1d15f526e6a7941d32e77b7825e6042dbf16a2e 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -48,5 +50,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
index 912df564bbd8a55ded1c983d591c07eb9dfaa898..4311b0cda48535c0538f60fb8a4abd7179109045 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -42,5 +44,6 @@
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
     <sound model='sb16'/>
     <sound model='es1370'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
index 912df564bbd8a55ded1c983d591c07eb9dfaa898..4311b0cda48535c0538f60fb8a4abd7179109045 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -42,5 +44,6 @@
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
     <sound model='sb16'/>
     <sound model='es1370'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
index 19eac3b0685122f8680c2da498b81f019cc0ab92..103cfbe9e7b6da43766f935a2ba18ce05a938549 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -41,5 +43,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
index 40ac8a97f008dbfc3cc169d2a17c24e0a09f5880..728e852b1e7be93e10612ff93d7fd8cd937248c1 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -41,5 +43,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
index 97f2bebdb3a0a3c6a1258879f389c5fe3cc2a776..7899baafa03d38abc57afbf2ff57c491d5234af5 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -40,5 +42,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
index 493d1b597ed3d6d3d81709def31bb74b38ea49a6..af5fbe1a2e739564a1b8e948c2a20cab454ce8b7 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -40,5 +42,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
index 97f2bebdb3a0a3c6a1258879f389c5fe3cc2a776..7899baafa03d38abc57afbf2ff57c491d5234af5 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -23,6 +23,7 @@
       <source file='/root/foo.img'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
@@ -30,6 +31,7 @@
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
@@ -40,5 +42,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
index ce7954ddea91a00d7205acdfcf70509f9a5b8acf..a6b765e1e9b64a7ac5371083d46aba9baa09e9c1 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
@@ -30,5 +30,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
index 286209bee35991f79a4b2870b7fb0de8bde5adf7..631ca07beb539c63ca3ddd496aa121e352dce6f4 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
@@ -31,5 +31,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
index c03e40b0976d8ca1bdcc1f950e2c9e6e26e38738..5e1fbce4fdb25048e81d993249971710bda51327 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
@@ -30,5 +30,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index a3cd7be711c69d4ea5ab5d6668fdf547b9b97007..384ff8bfcfb6699adeb3e664ac817847a09c1800 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -25,11 +25,13 @@
       <source dev='/dev/sda8'/>
       <backingStore/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <backingStore/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:0a:7b:39'/>
@@ -45,5 +47,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
index a404484b18d8835dcecde752195ef831e917b4a6..1dd00d5ad37accf61f7c8e622d816f943f216f94 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
@@ -34,5 +34,6 @@
         <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/>
       </source>
     </hostdev>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
index 0e92d0e95a77110f6db55cac8b9296ddac71f702..a7cd3471d5acf4918beef8a85eeac8bdce575d9f 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
index bafe97fc870b3448fe5ebefe8c9c7e556ae05fc8..6c12636297d80d7586125a1003d77c120fe3e283 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
@@ -23,5 +23,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
index fc57fa938d7b8e87d5c724a0ca5c3b7282004d01..c0ebf661d7c142e54ef4b74aa60dc91451ab0532 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
index a55f83e6f14eaab692046700bd88620d2f68b0ad..d1983cb4ea4b6ee10159aeb5875e4e5c2e175c75 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
index 9ae7bff6745fc2a4a8b3b7f394d0e05954e6a506..eacfc97de418e89d17dfe02191019b3c77ff175c 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
@@ -29,5 +29,6 @@
     <graphics type='vnc' port='5925' autoport='no' listen='0.0.0.0' keymap='ja'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
index c2eb798b5a44068bd4df6718c10325370abbf3f6..f5b80c86c40e4b0cc9444799e3da307b3366750c 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
@@ -29,5 +29,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
index c2eb798b5a44068bd4df6718c10325370abbf3f6..f5b80c86c40e4b0cc9444799e3da307b3366750c 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
@@ -29,5 +29,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
index 0fee41cedaa7b9240437014660effdbb42a49861..0aebf20503f9a5b29e9e22e7e5559b46b2c96326 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
@@ -32,5 +32,6 @@
     <input type='mouse' bus='xen'/>
     <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml
index 36b8c1eb6b395a601614cfba4fc76910332c3671..895605b254c72fbe0e02c3bbc272e9f9a23988a4 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv.xml
@@ -24,5 +24,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 99999f1e6aa85b9d55bce13a0ed7ded49b40e3f8..f7f61ccde31d8e5f947663dc4031ec9201f2d629 100644 (file)
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -17,6 +17,7 @@
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 static virCapsPtr caps;
+static virDomainXMLOptionPtr xmlopt;
 
 static int
 testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
@@ -53,7 +54,8 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
   vncport = xenStoreDomainGetVNCPort(conn, id);
   xenUnifiedUnlock(&priv);
 
-  if (!(def = xenParseSxprString(sexprData, xendConfigVersion, tty, vncport)))
+  if (!(def = xenParseSxprString(sexprData, xendConfigVersion,
+                                 tty, vncport, caps, xmlopt)))
       goto fail;
 
   if (!virDomainDefCheckABIStability(def, def)) {
@@ -116,6 +118,11 @@ mymain(void)
     if (!(caps = testXenCapsInit()))
         return EXIT_FAILURE;
 
+    if (!(xmlopt = xenDomainXMLConfInit())) {
+        virObjectUnref(caps);
+        return EXIT_FAILURE;
+    }
+
 #define DO_TEST(in, out, version)                                      \
     do {                                                               \
         struct testInfo info = { in, out, version };                   \
@@ -186,6 +193,7 @@ mymain(void)
     DO_TEST("boot-grub", "boot-grub", 1);
 
     virObjectUnref(caps);
+    virObjectUnref(xmlopt);
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }

diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
index 414f645b193478d733b4355cf1b5fb29c891d62c..d59aa2126c1201eec4affb92b579e50940b37110 100644 (file)
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
@@ -27,12 +27,14 @@
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>

diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml
index 642c2421b5404d3c318d82fd59862c21352f54ec..0e6d0b6bd947bf2b69d31000cf2c44d64a11006a 100644 (file)
--- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml
@@ -24,12 +24,14 @@
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>

diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
index 1c96a62e54219491741d1c861ffc96ffb5d73a96..718a2da0083df1029c69e467be2acadfd10903af 100644 (file)
--- a/tests/xlconfigdata/test-new-disk.xml
+++ b/tests/xlconfigdata/test-new-disk.xml
@@ -24,17 +24,20 @@
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/var/lib/libvirt/images/XenGuest2-home'/>
       <target dev='hdb' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>

diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml
index 8f3fcf5b149e2af157d87ee42d9d46df425df55f..3160c2b473349bdab318bf8487d15cd6d67f413a 100644 (file)
--- a/tests/xlconfigdata/test-spice-features.xml
+++ b/tests/xlconfigdata/test-spice-features.xml
@@ -24,12 +24,14 @@
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>

diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
index e5b43d993188699a7d24b65bfc69bfb6bb7473b7..30415fb31682d71a9fe4cfa7f681f66c3d67c07d 100644 (file)
--- a/tests/xlconfigdata/test-spice.xml
+++ b/tests/xlconfigdata/test-spice.xml
@@ -24,12 +24,14 @@
       <driver name='phy' type='raw'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>

diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 952b504364b9213ab81946561f6bdb17f09039c2..21f760d03eb82cc50dd42466ec996546dd88ff0f 100644 (file)
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -113,7 +113,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
     if (!(conf = virConfReadMem(xmcfgData, strlen(xmcfgData), 0)))
         goto fail;
 
-    if (!(def = xenParseXL(conf, caps, xendConfigVersion)))
+    if (!(def = xenParseXL(conf, caps, xmlopt, xendConfigVersion)))
         goto fail;
 
     if (!(gotxml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE |

diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
index 623eaa121a6e93c8fc155d88c6533a9583b0cc25..d2ec843dd6a7c20a739f41218e1d52c1f3a13276 100644 (file)
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/tests/xmconfigdata/test-escape-paths.xml
@@ -24,17 +24,20 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest&apos;&quot;'/>
       <target dev='hdb' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso&amp;test'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -49,5 +52,6 @@
     </graphics>
     <sound model='sb16'/>
     <sound model='es1370'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml
index 57a6531c4548ae335d067daa6f015c829d34acf9..06ad44eb81919d6b46167f17417deece02e8d921 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml
@@ -26,12 +26,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -44,5 +46,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
index 57a6531c4548ae335d067daa6f015c829d34acf9..06ad44eb81919d6b46167f17417deece02e8d921 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
@@ -26,12 +26,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -44,5 +46,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
index f6ebcf6dc3a6dc491c08171131f78c4905a98a9d..148c372f3493130b66bb38b61952c29a956a4aed 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
@@ -26,12 +26,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -44,5 +46,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
index 36ab389ca5273f4858318951c0a9a5d889549450..5db392caed8e593eac5ea57f65843b3fa4833657 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -42,5 +44,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-net-ioemu.xml b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml
index 3618baeb406dfc4223ba0f6765201951829f7ee4..ad15ddef8a462593ebec9d5d0edfa8c9a297157a 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-net-ioemu.xml
+++ b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -42,5 +44,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
index 6a2a439017290b97e4703a786f353b293164c8b2..4d23802cd97857ae6cdfacc242ffe52ce6bc24bc 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -42,5 +44,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index 3618baeb406dfc4223ba0f6765201951829f7ee4..ad15ddef8a462593ebec9d5d0edfa8c9a297157a 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -42,5 +44,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
index 7d6014d0164c8903c0335373b85f5ab373522302..dd5fd3f86a48bb4ae99188ede391bd4e6379f389 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -42,5 +44,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index 9b1fd268cc0e57a518cc3f2e6fc95ff2c0d935b4..a2897f1fb3031b729cefa5b9d808bcb96b9b63bd 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -47,5 +49,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
index a64d40baac0ed3e3df5200023f355fc98d4188e5..5cbca37c5d04b7bceda5968c3d05fd06a5f88d36 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -54,5 +56,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
index ce2cddb7a23616c4b4fe62b581fd81f313e442e1..27c29c6c7bd88a0c7726471beeeb178416fbd82a 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -50,5 +52,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index 36883def00e74121cebfd88b76cb562057c375d8..092c0628d5709b12ee1a90bed43db25e417fdeb2 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -50,5 +52,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index 982f9d60b9c925703e65d0e86d8c34df28ea57a4..a1394d97ffadcf4df2521e3c3af53359faf0f4b4 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -48,5 +50,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index 82a1d9b1ec671618188343445a50c9c51c267a4d..321d309ec324cbff0b2316e273c60fa1e7eb8d30 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -50,5 +52,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index 56ccbeae34f6ca49d0d9ee22919edab659ae4870..05c82fe081514202f07b933a7ef2fc59cd121770 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -48,5 +50,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index e2e933031711aa1ec92a99b8c9822e7077c4b0c2..c6c702c7c9d19e6dab1f9ac60bb75f9ce09b8541 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -48,5 +50,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index d68d77c06a07ac55b5112885d684bc44214c4151..72c169e03cf19da8b979280b6893726870c6d3a1 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -52,5 +54,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index aa3ed5c4d66ad5ff0e0aa52d56f7535436f7a247..ab179ecb0e5e9a8b9e8ad50bcfaad031d55cd6e1 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -52,5 +54,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index 256c7227f31dd82e83c1ef5e6053eaa485133b58..8c8d19a6326e6ffb32e769790d212e6fc6cbff66 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -52,5 +54,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index 235c8d444422579a0552b6d2ad40425237a6cf69..0e25cacb0fecff09acb2761603ce57647433bee2 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -50,5 +52,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
index 1429d10533b34754045b01a19c484ed4ff26d698..25364eb4df935117447cd2cb5658ad370236be6e 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -44,5 +46,6 @@
     </graphics>
     <sound model='sb16'/>
     <sound model='es1370'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index 25857f1d21e71af15fb1d447848c7e49fdb3a123..c7526ae628ffef6fb017b3f8309ea2c0cdf89131 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -43,5 +45,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
index c82c8df420816c64db116c5d05f5e3b08b939771..23535eb70f0dca24f1639d13c8f2e2ac30c778e5 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -41,5 +43,6 @@
     <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index 31b11760b10a1e0a9ede9b3dfde58084ef628a87..aa16eb1b3533d0f496468b6190adc3054fe09bcf 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -43,5 +45,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
index 3618baeb406dfc4223ba0f6765201951829f7ee4..ad15ddef8a462593ebec9d5d0edfa8c9a297157a 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -24,12 +24,14 @@
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
@@ -42,5 +44,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
index 74f1be18d85150dad5f383a02a98e45d70215240..a0952e8ec962baaa68de02b93172eaea6b48677c 100644 (file)
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -24,11 +24,13 @@
       <driver name='phy'/>
       <source dev='/dev/sda8'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='block' device='cdrom'>
       <driver name='phy'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:0a:7b:39'/>
@@ -45,5 +47,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml
index 34663442336de62e0f09923f50b6eaf643fb2381..0db020f04203d823df16dcb2bc7ab5fb6a6b4934 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml
@@ -32,5 +32,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml
index 20d96aa38b1def4e91bc7fee0ea7ff4abd0869e7..ff17aee436f798d0a08ef366aaa354f47efcb6fe 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-net-vifname.xml
+++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml
@@ -33,5 +33,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
index c02963d683993d52de8ffe106a141dae2a76cfbd..ce7bfb92ed47297f3f8e23edd2f8edc4a2017066 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
@@ -31,5 +31,6 @@
     <graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
index ee255506c98a3aa87bca49bc5ed6f9d10a12b643..cba6dffb84e21e829419936ee99134b53a296852 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
@@ -31,5 +31,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
index c02963d683993d52de8ffe106a141dae2a76cfbd..ce7bfb92ed47297f3f8e23edd2f8edc4a2017066 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
@@ -31,5 +31,6 @@
     <graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
index ee255506c98a3aa87bca49bc5ed6f9d10a12b643..cba6dffb84e21e829419936ee99134b53a296852 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
@@ -31,5 +31,6 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-paravirt-vcpu.xml b/tests/xmconfigdata/test-paravirt-vcpu.xml
index 52463d86e104af993e108d96618c302c9f3bf32d..3b0e0ce14f04206093fb50d0cddf226cfad77c74 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-vcpu.xml
+++ b/tests/xmconfigdata/test-paravirt-vcpu.xml
@@ -26,5 +26,6 @@
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index 191173422403df279303bb1e12a0a321194baa7a..bdb1e82624b02e056d1541cd872c72c9d3607300 100644 (file)
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/tests/xmconfigdata/test-pci-devs.xml
@@ -24,11 +24,13 @@
       <driver name='phy'/>
       <source dev='/dev/sda8'/>
       <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='block' device='cdrom'>
       <driver name='phy'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:0a:7b:39'/>
@@ -55,5 +57,6 @@
         <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/>
       </source>
     </hostdev>
+    <memballoon model='xen'/>
   </devices>
 </domain>

diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 79b09cacc0fa77c2dab4b20bd3fba89eeb4fbad4..804f9ee310c06b71e2afd15e4f690ca2c47deb8f 100644 (file)
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -120,7 +120,8 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
     if (!(conf = virConfReadMem(xmcfgData, strlen(xmcfgData), 0)))
         goto fail;
 
-    if (!(def = xenParseXM(conf, priv.xendConfigVersion, priv.caps)))
+    if (!(def = xenParseXM(conf, priv.xendConfigVersion,
+                           caps, xmlopt)))
         goto fail;
 
     if (!(gotxml = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE)))