External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-03 16:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jim Fehlig 2015-12-04 18:09:28 -07:00
parent 134e05e005
commit 9e6d721985
62 changed files with 197 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg
View File

@ -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"

2
tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
View File

@ -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>

3
tests/xlconfigdata/test-fullvirt-multiusb.cfg
View File

@ -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"

2
tests/xlconfigdata/test-fullvirt-multiusb.xml
View File

@ -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>

3
tests/xlconfigdata/test-new-disk.cfg
View File

@ -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"

2
tests/xlconfigdata/test-new-disk.xml
View File

@ -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>

3
tests/xlconfigdata/test-spice-features.cfg
View File

@ -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"

2
tests/xlconfigdata/test-spice-features.xml
View File

@ -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>

3
tests/xlconfigdata/test-spice.cfg
View File

@ -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"

2
tests/xlconfigdata/test-spice.xml
View File

@ -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>

29
tests/xlconfigtest.c
View File

@ -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);

5
tests/xmconfigdata/test-escape-paths.cfg
View File

@ -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"

2
tests/xmconfigdata/test-escape-paths.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-default-feature.cfg
View File

@ -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" ]

2
tests/xmconfigdata/test-fullvirt-default-feature.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-force-hpet.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-force-hpet.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-force-nohpet.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-localtime.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-localtime.xml
View File

@ -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>

3
tests/xmconfigdata/test-fullvirt-net-netfront.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-net-netfront.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-new-cdrom.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-file.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-file.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-null.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-null.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-pipe.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-pty.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-pty.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-stdio.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-tcp.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-udp.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-udp.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-serial-unix.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-serial-unix.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-sound.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-sound.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-usbmouse.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-usbmouse.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-usbtablet.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-usbtablet.xml
View File

@ -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>

5
tests/xmconfigdata/test-fullvirt-utc.cfg
View File

@ -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"

2
tests/xmconfigdata/test-fullvirt-utc.xml
View File

@ -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>

5
tests/xmconfigdata/test-no-source-cdrom.cfg
View File

@ -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"

2
tests/xmconfigdata/test-no-source-cdrom.xml
View File

@ -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>

5
tests/xmconfigdata/test-pci-devs.cfg
View File

@ -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"

2
tests/xmconfigdata/test-pci-devs.xml
View File

@ -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>

89
tests/xmconfigtest.c
View File

@ -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("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", 2);
DO_TEST("fullvirt-force-nohpet", 2);
DO_TEST("fullvirt-force-hpet");
DO_TEST("fullvirt-force-nohpet");
DO_TEST("fullvirt-parallel-tcp", 2);
DO_TEST("fullvirt-parallel-tcp");
DO_TEST("fullvirt-sound", 2);
DO_TEST("fullvirt-sound");
DO_TEST("fullvirt-net-netfront", 2);
DO_TEST("fullvirt-net-netfront");
DO_TEST_FORMAT("fullvirt-default-feature", 2);
DO_TEST_FORMAT("fullvirt-default-feature");
DO_TEST("escape-paths", 2);
DO_TEST("no-source-cdrom", 2);
DO_TEST("pci-devs", 2);
DO_TEST("escape-paths");
DO_TEST("no-source-cdrom");
DO_TEST("pci-devs");
virObjectUnref(caps);
virObjectUnref(xmlopt);