Xen: tests: use latest XEND_CONFIG_VERSION in xm/xl tests

Change all tests to use the latest XEND_CONFIG_VERSION
(XEND_CONFIG_VERSION_3_1_0 = 4). Fix tests that do not conform to
the latest version.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>

diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg
index 1fac3a55ea0baef1058f1a18b405cb3fd124101c..f452af62d89c47c03696946b36ba2e5fe9936807 100644 (file)
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg
@@ -8,6 +8,7 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -18,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
index d59aa2126c1201eec4affb92b579e50940b37110..f750e0207496c4b74e077800151bd2d620797758 100644 (file)
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
@@ -17,7 +17,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.cfg b/tests/xlconfigdata/test-fullvirt-multiusb.cfg
index 68a2614eb3abadfb80c4e5223cc9f80b19fd484b..d0482a83ec19d595ad526bab61276e4dcd1cd4ed 100755 (executable)
--- a/tests/xlconfigdata/test-fullvirt-multiusb.cfg
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.cfg
@@ -8,6 +8,7 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -18,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml
index 0e6d0b6bd947bf2b69d31000cf2c44d64a11006a..9e5cad9edc8c92e506f14a69c149aa4af60109be 100644 (file)
--- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xlconfigdata/test-new-disk.cfg b/tests/xlconfigdata/test-new-disk.cfg
index 9e9f1066e73ca89f3e444029ee298bb0bacdcc80..9b9fb366b6d0e2559c3f3b9aa3a18b8016be77df 100644 (file)
--- a/tests/xlconfigdata/test-new-disk.cfg
+++ b/tests/xlconfigdata/test-new-disk.cfg
@@ -8,6 +8,7 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -17,7 +18,7 @@ sdl = 0
 vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
index 718a2da0083df1029c69e467be2acadfd10903af..49f6dbed1af2afd9b524bc8c6d20f6a17fb0fd63 100644 (file)
--- a/tests/xlconfigdata/test-new-disk.xml
+++ b/tests/xlconfigdata/test-new-disk.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xlconfigdata/test-spice-features.cfg b/tests/xlconfigdata/test-spice-features.cfg
index c3e7111862d4d120800569403d8345a311d7ce81..152cb27ee3ebdb5144562b8bd21afc6b224f9c1a 100644 (file)
--- a/tests/xlconfigdata/test-spice-features.cfg
+++ b/tests/xlconfigdata/test-spice-features.cfg
@@ -8,12 +8,13 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 device_model = "/usr/lib/xen/bin/qemu-dm"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml
index 3160c2b473349bdab318bf8487d15cd6d67f413a..d40a671978d70dd728e85de68ae84364793b7181 100644 (file)
--- a/tests/xlconfigdata/test-spice-features.xml
+++ b/tests/xlconfigdata/test-spice-features.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xlconfigdata/test-spice.cfg b/tests/xlconfigdata/test-spice.cfg
index d89f2bad9afba860250e4713fd82ec62b07c2ba9..1a96114a817f2e93c948017668e586cf5d85e071 100644 (file)
--- a/tests/xlconfigdata/test-spice.cfg
+++ b/tests/xlconfigdata/test-spice.cfg
@@ -8,12 +8,13 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 device_model = "/usr/lib/xen/bin/qemu-dm"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
index 30415fb31682d71a9fe4cfa7f681f66c3d67c07d..d15557ed80fe88d3b784b5d7c9c41594afe10f7d 100644 (file)
--- a/tests/xlconfigdata/test-spice.xml
+++ b/tests/xlconfigdata/test-spice.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 21f760d03eb82cc50dd42466ec996546dd88ff0f..31865ff64f2b30983e86048d5fdd5eddf7a73618 100644 (file)
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -46,7 +46,7 @@ static virDomainXMLOptionPtr xmlopt;
  * parses the xml, creates a domain def and compare with equivalent xm config
  */
 static int
-testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
+testCompareParseXML(const char *xmcfg, const char *xml)
 {
     char *gotxmcfgData = NULL;
     virConfPtr conf = NULL;
@@ -70,7 +70,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
         goto fail;
     }
 
-    if (!(conf = xenFormatXL(def, conn,  xendConfigVersion)))
+    if (!(conf = xenFormatXL(def, conn, 4)))
         goto fail;
 
     if (virConfWriteMem(gotxmcfgData, &wrote, conf) < 0)
@@ -95,7 +95,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
  * parses the xl config, develops domain def and compares with equivalent xm config
  */
 static int
-testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
+testCompareFormatXML(const char *xmcfg, const char *xml)
 {
     char *xmcfgData = NULL;
     char *gotxml = NULL;
@@ -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, xmlopt, xendConfigVersion)))
+    if (!(def = xenParseXL(conf, caps, xmlopt, 4)))
         goto fail;
 
     if (!(gotxml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE |
@@ -139,7 +139,6 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
 
 struct testInfo {
     const char *name;
-    int version;
     int mode;
 };
 
@@ -158,9 +157,9 @@ testCompareHelper(const void *data)
         goto cleanup;
 
     if (info->mode == 0)
-        result = testCompareParseXML(cfg, xml, info->version);
+        result = testCompareParseXML(cfg, xml);
     else
-        result = testCompareFormatXML(cfg, xml, info->version);
+        result = testCompareFormatXML(cfg, xml);
 
  cleanup:
     VIR_FREE(xml);
@@ -181,10 +180,10 @@ mymain(void)
     if (!(xmlopt = libxlCreateXMLConf()))
         return EXIT_FAILURE;
 
-#define DO_TEST(name, version)                                          \
+#define DO_TEST(name)                                                   \
     do {                                                                \
-        struct testInfo info0 = { name, version, 0 };                   \
-        struct testInfo info1 = { name, version, 1 };                   \
+        struct testInfo info0 = { name, 0 };                            \
+        struct testInfo info1 = { name, 1 };                            \
         if (virtTestRun("Xen XM-2-XML Parse  " name,                    \
                         testCompareHelper, &info0) < 0)                 \
             ret = -1;                                                   \
@@ -193,15 +192,15 @@ mymain(void)
             ret = -1;                                                   \
     } while (0)
 
-    DO_TEST("new-disk", 3);
-    DO_TEST("spice", 3);
-    DO_TEST("spice-features", 3);
+    DO_TEST("new-disk");
+    DO_TEST("spice");
+    DO_TEST("spice-features");
 
 #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST
-    DO_TEST("fullvirt-multiusb", 3);
+    DO_TEST("fullvirt-multiusb");
 #endif
 #ifdef LIBXL_HAVE_BUILDINFO_KERNEL
-    DO_TEST("fullvirt-direct-kernel-boot", 3);
+    DO_TEST("fullvirt-direct-kernel-boot");
 #endif
 
     virObjectUnref(caps);

diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg
index 64c9eedfc49ba266be8236132ffbadb032410c48..98570bdcdf4b58511dc467cc3a1fd737f18ccb98 100644 (file)
--- a/tests/xmconfigdata/test-escape-paths.cfg
+++ b/tests/xmconfigdata/test-escape-paths.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 soundhw = "sb16,es1370"

diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
index d2ec843dd6a7c20a739f41218e1d52c1f3a13276..db01910999f5d36500b87bf5875c65d475eebda4 100644 (file)
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/tests/xmconfigdata/test-escape-paths.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.cfg b/tests/xmconfigdata/test-fullvirt-default-feature.cfg
index 5ce234f0a72ffd473e07f5a8fc9ff6b053101254..c9d072d9dab6a9f98bf6235648329d69c1fc6142 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-default-feature.cfg
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.cfg
@@ -7,6 +7,9 @@ builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
 hpet = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -17,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml
index 06ad44eb81919d6b46167f17417deece02e8d921..231aea6b5684274411a502e4bb055336b69fa5ff 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'>
+  <clock offset='variable' adjustment='0' basis='utc'>
     <timer name='hpet' present='yes'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
index 0bd76d3fb4f98177e3d679f9a94e3062afbe6060..b89ed424de120bf420fd69cf5d8803dcc28b1855 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
@@ -6,7 +6,10 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
 hpet = 1
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -17,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
index 06ad44eb81919d6b46167f17417deece02e8d921..231aea6b5684274411a502e4bb055336b69fa5ff 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'>
+  <clock offset='variable' adjustment='0' basis='utc'>
     <timer name='hpet' present='yes'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
index a4c2fa0cd602efab31594e937013bb3ff78cdb24..99e6d38846e7b8e89353bcba7116419f8a1a7f7c 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
@@ -6,7 +6,10 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
 hpet = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -17,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
index 148c372f3493130b66bb38b61952c29a956a4aed..ef216c3c271fcd3fa2303eb61b393a32202fed2d 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'>
+  <clock offset='variable' adjustment='0' basis='utc'>
     <timer name='hpet' present='no'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg
index 38c558b5c60c98683c9be015c08c6e0b8429b726..5d0742328d30f7f43525b61bf1c8de71eb8d347c 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-localtime.cfg
+++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 1
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
index 5db392caed8e593eac5ea57f65843b3fa4833657..0162246d2b255302a2685df8260e35ea6633df05 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='localtime' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='localtime'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
index 21d81be700ae7779b5ba7dd099216e40567292de..da1d3684a6f6bb8ababad630af81ead38b167f9f 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"

diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
index 4d23802cd97857ae6cdfacc242ffe52ce6bc24bc..172a530aa6059edb09a856f938b1e0f00cc9c901 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
index 722f02148d95ea4e72d9a09e928e1c298c8d6354..67e2511300d2887bb6f359249cfa02cfe7645393 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index ad15ddef8a462593ebec9d5d0edfa8c9a297157a..6544cb3da41cc1ad97de2471e8ad23dc91938240 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
index 0d999ad0baa1124b882d2ce3b92c03befef34454..1bbce5697ff27bf6fb29089f719d6b9d0649481b 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "tcp:127.0.0.1:7777"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index a2897f1fb3031b729cefa5b9d808bcb96b9b63bd..5aef2dec7c49a8931c8e8998814a23bfea0dee34 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
index f0fb178b8b903ffc543fb568b2dfb6bf605ead87..c72279281a90837969538d00d10f705bd8f1e5ca 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = [ "/dev/ttyS0", "/dev/ttyS1" ]
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
index 5cbca37c5d04b7bceda5968c3d05fd06a5f88d36..a9e68b5edbf178e3c7eac8150fe2237d37965751 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
index b2cb1eaa5295c02a01825de128d08fd06384c1d3..4baffe63261b3fe115431c5ad5053d71c9d66f2d 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = [ "none", "/dev/ttyS1" ]
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
index 27c29c6c7bd88a0c7726471beeeb178416fbd82a..5564fa8b1dcda06e23119d2cddfdbd68499cc3b0 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
index 65c09e80a3b170ba674b54311832f0fc178deb36..3d26e26fb943d47ca2d4eae38c367599d4faf5e5 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "file:/tmp/serial.log"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index 092c0628d5709b12ee1a90bed43db25e417fdeb2..f592d446f06d6b203880718dc83ed0ff1d9b7bcb 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
index 4c83216a73c93d61f63ee750d1b099078600caa0..6b0f2a4392cacc184c59aed59b3a405d81dbf5b2 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "null"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index a1394d97ffadcf4df2521e3c3af53359faf0f4b4..78142a76740fd3ab783ef68ed47f46e8ce87ca0d 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
index 09bfd3b0eed42659f7ca38339e371cd8b0a5ae95..2bd83774bd90a371c936eb9e726bf68b2fa3d226 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "pipe:/tmp/serial.pipe"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index 321d309ec324cbff0b2316e273c60fa1e7eb8d30..d3f06535c9afe67a72dba5beb9f635ad91009db8 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
index e5d7c93dd48400c4e18f364c4fb24814fe383127..022f975820b2472372611c79b1e554b4a0875048 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "pty"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index 05c82fe081514202f07b933a7ef2fc59cd121770..bc8e1827ed687add3bff279e0b4b73b2ab9fc453 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
index 5f5628c8a64c7352a84fc45e0d87435e9e56202f..c339a94cf834d59ae11be123e3e6774a2d29cdfd 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "stdio"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index c6c702c7c9d19e6dab1f9ac60bb75f9ce09b8541..9244a7cbd877f81498828d54cdf15c3e8cd124f2 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
index e28b97b3507317be1c8bccc878d35698c832925c..56eefacf90e26aafc906c1f3db0a1e3bada30d0d 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "telnet:127.0.0.1:9999,server,nowait"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index 72c169e03cf19da8b979280b6893726870c6d3a1..2ffdc8a2613d985720a70eb24b565d1bcbe1de8f 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
index 64b709d29305d313be83bd7a59f745434d51d430..d569852afad03716da619bbca5f7f1df364b1ed7 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "tcp:127.0.0.1:7777"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index ab179ecb0e5e9a8b9e8ad50bcfaad031d55cd6e1..ff7ec9b09b2d31b1f469d0bb5280375b67195e54 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
index acf594dcf159efe13706f763437c24a7ea32db89..b1ef8f5ba7ac4acac5a20ac08ed83fd657e38b49 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "udp:127.0.0.1:9999@0.0.0.0:99998"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index 8c8d19a6326e6ffb32e769790d212e6fc6cbff66..f2f2b1ff7461a2d44e9d9c3a1c65eded275f6420 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
index 1b7da437ed9762b7a65d91fcf6465784be325f5b..30f03991ab66844212b62113df57cef129ff6075 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "unix:/tmp/serial.sock,server,nowait"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index 0e25cacb0fecff09acb2761603ce57647433bee2..eaa484b035a398a634016e9cd40afd2fa3a3f218 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg
index c621fb1e8e5108af6c7924daaef84aefbfdfb78b..c11336a14ce1f1f2709bd38f795869eaf6d1545a 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-sound.cfg
+++ b/tests/xmconfigdata/test-fullvirt-sound.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 soundhw = "sb16,es1370"

diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
index 25364eb4df935117447cd2cb5658ad370236be6e..6ee3dfdb0bae25eaa5b443c870ee4d2e6ae2376e 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
index c8004e7c165363811b629482a9f96df216f1d59e..33738ad0aaec4f49669bd2994c1b86c23b6bfc7c 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index c7526ae628ffef6fb017b3f8309ea2c0cdf89131..5d739f137ef6c227bdac58b5469162a1e37f12b9 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
index 4f2417b95ed446ddecb009733eefa9353777d981..8e222bb6b7c6f234de16acd97f1d290f535c57c3 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index aa16eb1b3533d0f496468b6190adc3054fe09bcf..9933ef7637debf4bc0ecea2b4d837f6669774f6c 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg
index 722f02148d95ea4e72d9a09e928e1c298c8d6354..67e2511300d2887bb6f359249cfa02cfe7645393 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-utc.cfg
+++ b/tests/xmconfigdata/test-fullvirt-utc.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
index ad15ddef8a462593ebec9d5d0edfa8c9a297157a..6544cb3da41cc1ad97de2471e8ad23dc91938240 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>

diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg
index 8d0061881e01c3a8ca7ad75daee824ebd6789972..70980059adc25d68832d1ee4fe359045d0b764b2 100644 (file)
--- a/tests/xmconfigdata/test-no-source-cdrom.cfg
+++ b/tests/xmconfigdata/test-no-source-cdrom.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
@@ -14,7 +17,7 @@ device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
-vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "pty"
 builder = "hvm"

diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
index a0952e8ec962baaa68de02b93172eaea6b48677c..08ee70178f88714401f9736a6ddaaf5103123967 100644 (file)
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>

diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg
index a90dd940fab7d89c2f6f617d78628bf7eb8e0d1f..777314fa09ef257df165a4fd2cbf6b56b3a1ce31 100644 (file)
--- a/tests/xmconfigdata/test-pci-devs.cfg
+++ b/tests/xmconfigdata/test-pci-devs.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
@@ -14,7 +17,7 @@ device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
-vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000" ]
 pci = [ "0001:0c:1b.2", "0000:01:13.0" ]
 parallel = "none"
 serial = "pty"

diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index bdb1e82624b02e056d1541cd872c72c9d3607300..31db26f052031e9fa473eb714959cbae874b66ff 100644 (file)
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/tests/xmconfigdata/test-pci-devs.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>

diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index bfbd9c4e61945107c9f53c48a8bf7a0fc1d87a49..f2705eb0ce509cfa4e4a041ba7ff87c0888573ba 100644 (file)
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -43,7 +43,7 @@ static virCapsPtr caps;
 static virDomainXMLOptionPtr xmlopt;
 
 static int
-testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
+testCompareParseXML(const char *xmcfg, const char *xml)
 {
     char *gotxmcfgData = NULL;
     virConfPtr conf = NULL;
@@ -60,7 +60,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
     if (!conn) goto fail;
 
     /* Many puppies died to bring you this code. */
-    priv.xendConfigVersion = xendConfigVersion;
+    priv.xendConfigVersion = 4;
     priv.caps = caps;
     conn->privateData = &priv;
 
@@ -73,7 +73,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
         goto fail;
     }
 
-    if (!(conf = xenFormatXM(conn, def, xendConfigVersion)))
+    if (!(conf = xenFormatXM(conn, def, 4)))
         goto fail;
 
     if (virConfWriteMem(gotxmcfgData, &wrote, conf) < 0)
@@ -96,7 +96,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
 }
 
 static int
-testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
+testCompareFormatXML(const char *xmcfg, const char *xml)
 {
     char *xmcfgData = NULL;
     char *gotxml = NULL;
@@ -113,7 +113,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
         goto fail;
 
     /* Many puppies died to bring you this code. */
-    priv.xendConfigVersion = xendConfigVersion;
+    priv.xendConfigVersion = 4;
     priv.caps = caps;
     conn->privateData = &priv;
 
@@ -146,7 +146,6 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
 
 struct testInfo {
     const char *name;
-    int version;
     int mode;
 };
 
@@ -166,9 +165,9 @@ testCompareHelper(const void *data)
         goto cleanup;
 
     if (info->mode == 0)
-        result = testCompareParseXML(cfg, xml, info->version);
+        result = testCompareParseXML(cfg, xml);
     else
-        result = testCompareFormatXML(cfg, xml, info->version);
+        result = testCompareFormatXML(cfg, xml);
 
  cleanup:
     VIR_FREE(xml);
@@ -190,66 +189,66 @@ mymain(void)
     if (!(xmlopt = xenDomainXMLConfInit()))
         return EXIT_FAILURE;
 
-#define DO_TEST_PARSE(name, version)                                    \
+#define DO_TEST_PARSE(name)                                             \
     do {                                                                \
-        struct testInfo info0 = { name, version, 0 };                   \
+        struct testInfo info0 = { name, 0 };                            \
         if (virtTestRun("Xen XM-2-XML Parse  " name,                    \
                         testCompareHelper, &info0) < 0)                 \
             ret = -1;                                                   \
     } while (0)
 
 
-#define DO_TEST_FORMAT(name, version)                                   \
+#define DO_TEST_FORMAT(name)                                            \
     do {                                                                \
-        struct testInfo info1 = { name, version, 1 };                   \
+        struct testInfo info1 = { name, 1 };                            \
         if (virtTestRun("Xen XM-2-XML Format " name,                    \
                         testCompareHelper, &info1) < 0)                 \
             ret = -1;                                                   \
     } while (0)
 
 
-#define DO_TEST(name, version)                                          \
+#define DO_TEST(name)                                                   \
     do {                                                                \
-        DO_TEST_PARSE(name, version);                                   \
-        DO_TEST_FORMAT(name, version);                                  \
+        DO_TEST_PARSE(name);                                            \
+        DO_TEST_FORMAT(name);                                           \
     } while (0)
 
-    DO_TEST("paravirt-new-pvfb", 3);
-    DO_TEST("paravirt-new-pvfb-vncdisplay", 3);
-    DO_TEST("paravirt-net-e1000", 3);
-    DO_TEST("paravirt-net-vifname", 3);
-    DO_TEST("paravirt-vcpu", 2);
-    DO_TEST("fullvirt-new-cdrom", 2);
-    DO_TEST("fullvirt-utc", 2);
-    DO_TEST("fullvirt-localtime", 2);
-    DO_TEST("fullvirt-usbtablet", 2);
-    DO_TEST("fullvirt-usbmouse", 2);
-    DO_TEST("fullvirt-serial-file", 2);
-    DO_TEST("fullvirt-serial-dev-2-ports", 2);
-    DO_TEST("fullvirt-serial-dev-2nd-port", 2);
-    DO_TEST("fullvirt-serial-null", 2);
-    DO_TEST("fullvirt-serial-pipe", 2);
-    DO_TEST("fullvirt-serial-pty", 2);
-    DO_TEST("fullvirt-serial-stdio", 2);
-    DO_TEST("fullvirt-serial-tcp", 2);
-    DO_TEST("fullvirt-serial-tcp-telnet", 2);
-    DO_TEST("fullvirt-serial-udp", 2);
-    DO_TEST("fullvirt-serial-unix", 2);
-
-    DO_TEST("fullvirt-force-hpet", 2);
-    DO_TEST("fullvirt-force-nohpet", 2);
-
-    DO_TEST("fullvirt-parallel-tcp", 2);
-
-    DO_TEST("fullvirt-sound", 2);
-
-    DO_TEST("fullvirt-net-netfront", 2);
-
-    DO_TEST_FORMAT("fullvirt-default-feature", 2);
-
-    DO_TEST("escape-paths", 2);
-    DO_TEST("no-source-cdrom", 2);
-    DO_TEST("pci-devs", 2);
+    DO_TEST("paravirt-new-pvfb");
+    DO_TEST("paravirt-new-pvfb-vncdisplay");
+    DO_TEST("paravirt-net-e1000");
+    DO_TEST("paravirt-net-vifname");
+    DO_TEST("paravirt-vcpu");
+    DO_TEST("fullvirt-new-cdrom");
+    DO_TEST("fullvirt-utc");
+    DO_TEST("fullvirt-localtime");
+    DO_TEST("fullvirt-usbtablet");
+    DO_TEST("fullvirt-usbmouse");
+    DO_TEST("fullvirt-serial-file");
+    DO_TEST("fullvirt-serial-dev-2-ports");
+    DO_TEST("fullvirt-serial-dev-2nd-port");
+    DO_TEST("fullvirt-serial-null");
+    DO_TEST("fullvirt-serial-pipe");
+    DO_TEST("fullvirt-serial-pty");
+    DO_TEST("fullvirt-serial-stdio");
+    DO_TEST("fullvirt-serial-tcp");
+    DO_TEST("fullvirt-serial-tcp-telnet");
+    DO_TEST("fullvirt-serial-udp");
+    DO_TEST("fullvirt-serial-unix");
+
+    DO_TEST("fullvirt-force-hpet");
+    DO_TEST("fullvirt-force-nohpet");
+
+    DO_TEST("fullvirt-parallel-tcp");
+
+    DO_TEST("fullvirt-sound");
+
+    DO_TEST("fullvirt-net-netfront");
+
+    DO_TEST_FORMAT("fullvirt-default-feature");
+
+    DO_TEST("escape-paths");
+    DO_TEST("no-source-cdrom");
+    DO_TEST("pci-devs");
 
     virObjectUnref(caps);
     virObjectUnref(xmlopt);