External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-21 10:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prepare xm_internal driver for new domain XML apis

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-07-25 13:39:02 +00:00
parent 73d021c5c1
commit 225fb3e93c
48 changed files with 568 additions and 1028 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Fri Jul 25 14:29:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
Prepare xm_internal driver for new domain XML apis.
* src/xm_internal.c, src/xm_internal.h: Track internal
domain objects as virDomainDefPtr instead of virConfPtr
objects, and start to use generic domain APIs
* tests/xmconfigdata/*: Update to follow XML ordering
for new APIs
* tests/xmconfigtest.c: Fixup to comply with new internal
APIs.
Fri Jul 25 14:00:27 BST 2008 Daniel P. Berrange <berrange@redhat.com> Fri Jul 25 14:00:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/test.c: Increment dom ID tracker when setting up * src/test.c: Increment dom ID tracker when setting up

989
src/xm_internal.c
View File

File diff suppressed because it is too large Load Diff

13
src/xm_internal.h
View File

@ -28,10 +28,7 @@
#include "libvirt/libvirt.h" #include "libvirt/libvirt.h"
#include "conf.h" #include "conf.h"
#include "internal.h" #include "internal.h"
#include "domain_conf.h"
#ifdef __cplusplus
extern "C" {
#endif
extern struct xenUnifiedDriver xenXMDriver; extern struct xenUnifiedDriver xenXMDriver;
int xenXMInit (void); int xenXMInit (void);
@ -58,11 +55,9 @@ int xenXMDomainCreate(virDomainPtr domain);
virDomainPtr xenXMDomainDefineXML(virConnectPtr con, const char *xml); virDomainPtr xenXMDomainDefineXML(virConnectPtr con, const char *xml);
int xenXMDomainUndefine(virDomainPtr domain); int xenXMDomainUndefine(virDomainPtr domain);
virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml); virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, virDomainDefPtr def);
char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf); virDomainDefPtr xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf);
int xenXMDomainBlockPeek (virDomainPtr dom, const char *path, unsigned long long offset, size_t size, void *buffer); int xenXMDomainBlockPeek (virDomainPtr dom, const char *path, unsigned long long offset, size_t size, void *buffer);
#ifdef __cplusplus
}
#endif
#endif #endif

2
tests/Makefile.am
View File

@ -101,7 +101,7 @@ sexpr2xmltest_SOURCES = \
sexpr2xmltest_LDADD = $(LDADDS) sexpr2xmltest_LDADD = $(LDADDS)
xmconfigtest_SOURCES = \ xmconfigtest_SOURCES = \
xmconfigtest.c \ xmconfigtest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h testutils.c testutils.h
xmconfigtest_LDADD = $(LDADDS) xmconfigtest_LDADD = $(LDADDS)

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

@ -20,7 +20,7 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso&test,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso&test,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "none" serial = "none"
soundhw = "sb16,es1370" soundhw = "sb16,es1370"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2&amp;test</name> <name>XenGuest2&amp;test</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader&amp;test</loader> <loader>/usr/lib/xen/boot/hvmloader&amp;test</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm&amp;test</emulator> <emulator>/usr/lib/xen/bin/qemu-dm&amp;test</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,11 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
<sound model='sb16'/> <sound model='sb16'/>
<sound model='es1370'/> <sound model='es1370'/>
</devices> </devices>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "none" serial = "none"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='localtime'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='localtime'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,10 +32,10 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "none" serial = "none"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,10 +32,10 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

2
tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
View File

@ -21,6 +21,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,ioemu:hda,w" ] disk = [ "phy:/dev/HostVG/XenGuest2,ioemu:hda,w" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr0,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr0,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "none" serial = "none"

24
tests/xmconfigdata/test-fullvirt-old-cdrom.xml
View File

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,10 +32,10 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "tcp:127.0.0.1:7777" parallel = "tcp:127.0.0.1:7777"
serial = "none" serial = "none"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,15 +32,15 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<parallel type='tcp'> <parallel type='tcp'>
<source mode='connect' host='127.0.0.1' service='7777'/> <source mode='connect' host='127.0.0.1' service='7777'/>
<protocol type='raw'/> <protocol type='raw'/>
<target port='0'/> <target port='0'/>
</parallel> </parallel>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "file:/tmp/serial.log" serial = "file:/tmp/serial.log"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,9 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='file'> <serial type='file'>
<source path='/tmp/serial.log'/> <source path='/tmp/serial.log'/>
<target port='0'/> <target port='0'/>
@ -45,5 +43,7 @@
<source path='/tmp/serial.log'/> <source path='/tmp/serial.log'/>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "null" serial = "null"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,16 +32,16 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='null'> <serial type='null'>
<target port='0'/> <target port='0'/>
</serial> </serial>
<console type='null'> <console type='null'>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "pipe:/tmp/serial.pipe" serial = "pipe:/tmp/serial.pipe"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,9 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='pipe'> <serial type='pipe'>
<source path='/tmp/serial.pipe'/> <source path='/tmp/serial.pipe'/>
<target port='0'/> <target port='0'/>
@ -45,5 +43,7 @@
<source path='/tmp/serial.pipe'/> <source path='/tmp/serial.pipe'/>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "pty" serial = "pty"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,16 +32,16 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='pty'> <serial type='pty'>
<target port='0'/> <target port='0'/>
</serial> </serial>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "stdio" serial = "stdio"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,16 +32,16 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='stdio'> <serial type='stdio'>
<target port='0'/> <target port='0'/>
</serial> </serial>
<console type='stdio'> <console type='stdio'>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "telnet:127.0.0.1:9999,listen" serial = "telnet:127.0.0.1:9999,listen"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,9 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='tcp'> <serial type='tcp'>
<source mode='bind' host='127.0.0.1' service='9999'/> <source mode='bind' host='127.0.0.1' service='9999'/>
<protocol type='telnet'/> <protocol type='telnet'/>
@ -47,5 +45,7 @@
<protocol type='telnet'/> <protocol type='telnet'/>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "tcp:127.0.0.1:7777" serial = "tcp:127.0.0.1:7777"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,9 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='tcp'> <serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='7777'/> <source mode='connect' host='127.0.0.1' service='7777'/>
<protocol type='raw'/> <protocol type='raw'/>
@ -47,5 +45,7 @@
<protocol type='raw'/> <protocol type='raw'/>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "udp:127.0.0.1:9999@0.0.0.0:99998" serial = "udp:127.0.0.1:9999@0.0.0.0:99998"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,20 +32,20 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='udp'> <serial type='udp'>
<source mode='connect' host='127.0.0.1' service='9999'/>
<source mode='bind' host='0.0.0.0' service='99998'/> <source mode='bind' host='0.0.0.0' service='99998'/>
<source mode='connect' host='127.0.0.1' service='9999'/>
<target port='0'/> <target port='0'/>
</serial> </serial>
<console type='udp'> <console type='udp'>
<source mode='connect' host='127.0.0.1' service='9999'/>
<source mode='bind' host='0.0.0.0' service='99998'/> <source mode='bind' host='0.0.0.0' service='99998'/>
<source mode='connect' host='127.0.0.1' service='9999'/>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "unix:/tmp/serial.sock,listen" serial = "unix:/tmp/serial.sock,listen"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,9 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<serial type='unix'> <serial type='unix'>
<source mode='bind' path='/tmp/serial.sock'/> <source mode='bind' path='/tmp/serial.sock'/>
<target port='0'/> <target port='0'/>
@ -45,5 +43,7 @@
<source mode='bind' path='/tmp/serial.sock'/> <source mode='bind' path='/tmp/serial.sock'/>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,7 +20,7 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "none" serial = "none"
soundhw = "sb16,es1370" soundhw = "sb16,es1370"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,11 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
<sound model='sb16'/> <sound model='sb16'/>
<sound model='es1370'/> <sound model='es1370'/>
</devices> </devices>

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

@ -21,6 +21,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "none" serial = "none"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,11 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='usb'/> <input type='mouse' bus='usb'/>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -32,7 +32,7 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='tablet'/> <input type='tablet'/>

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

@ -21,6 +21,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "none" serial = "none"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,11 +32,11 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='tablet' bus='usb'/> <input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

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

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3E:66:92:9C,bridge=xenbr1,type=ioemu" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
parallel = "none" parallel = "none"
serial = "none" serial = "none"

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

@ -1,23 +1,23 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest2</name> <name>XenGuest2</name>
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
<memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu>
<os> <os>
<type>hvm</type> <type arch='i686' machine='xenfv'>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>
<boot dev='cdrom'/> <boot dev='cdrom'/>
</os> </os>
<currentMemory>403456</currentMemory> <features>
<memory>592896</memory> <acpi/>
<vcpu>1</vcpu> <apic/>
<pae/>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<features>
<pae/>
<acpi/>
<apic/>
</features>
<clock offset='utc'/>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
@ -32,10 +32,10 @@
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:92:9C'/> <mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/> <source bridge='xenbr1'/>
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

2
tests/xmconfigdata/test-paravirt-net-e1000.cfg
View File

@ -9,4 +9,4 @@ on_reboot = "restart"
on_crash = "restart" on_crash = "restart"
vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ] vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3E:66:94:9C,model=e1000,ip=192.168.0.9" ] vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,model=e1000" ]

17
tests/xmconfigdata/test-paravirt-net-e1000.xml
View File

@ -1,28 +1,33 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest1</name> <name>XenGuest1</name>
<uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
<bootloader>/usr/bin/pygrub</bootloader>
<currentMemory>403456</currentMemory>
<memory>592896</memory> <memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu> <vcpu>1</vcpu>
<bootloader>/usr/bin/pygrub</bootloader>
<os>
<type arch='i686' machine='xenpv'>linux</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest1'/> <source dev='/dev/HostVG/XenGuest1'/>
<target dev='xvda' bus='xen'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:94:9C'/> <mac address='00:16:3e:66:94:9c'/>
<ip address='192.168.0.9'/> <source bridge='br0'/>
<model type='e1000'/> <model type='e1000'/>
</interface> </interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

2
tests/xmconfigdata/test-paravirt-new-pvfb.cfg
View File

@ -9,4 +9,4 @@ on_reboot = "restart"
on_crash = "restart" on_crash = "restart"
vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ] vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3E:66:94:9C,ip=192.168.0.9" ] vif = [ "mac=00:16:3e:66:94:9c,bridge=br0" ]

17
tests/xmconfigdata/test-paravirt-new-pvfb.xml
View File

@ -1,27 +1,32 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest1</name> <name>XenGuest1</name>
<uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
<bootloader>/usr/bin/pygrub</bootloader>
<currentMemory>403456</currentMemory>
<memory>592896</memory> <memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu> <vcpu>1</vcpu>
<bootloader>/usr/bin/pygrub</bootloader>
<os>
<type arch='i686' machine='xenpv'>linux</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest1'/> <source dev='/dev/HostVG/XenGuest1'/>
<target dev='xvda' bus='xen'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:94:9C'/> <mac address='00:16:3e:66:94:9c'/>
<ip address='192.168.0.9'/> <source bridge='br0'/>
</interface> </interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

2
tests/xmconfigdata/test-paravirt-old-pvfb.cfg
View File

@ -13,4 +13,4 @@ vncunused = 1
vnclisten = "127.0.0.1" vnclisten = "127.0.0.1"
vncpasswd = "123poi" vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3E:66:94:9C,ip=192.168.0.9" ] vif = [ "mac=00:16:3e:66:94:9c,bridge=br0" ]

17
tests/xmconfigdata/test-paravirt-old-pvfb.xml
View File

@ -1,27 +1,32 @@
<domain type='xen'> <domain type='xen'>
<name>XenGuest1</name> <name>XenGuest1</name>
<uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
<bootloader>/usr/bin/pygrub</bootloader>
<currentMemory>403456</currentMemory>
<memory>592896</memory> <memory>592896</memory>
<currentMemory>403456</currentMemory>
<vcpu>1</vcpu> <vcpu>1</vcpu>
<bootloader>/usr/bin/pygrub</bootloader>
<os>
<type arch='i686' machine='xenpv'>linux</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest1'/> <source dev='/dev/HostVG/XenGuest1'/>
<target dev='xvda' bus='xen'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:94:9C'/> <mac address='00:16:3e:66:94:9c'/>
<ip address='192.168.0.9'/> <source bridge='br0'/>
</interface> </interface>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
</console> </console>
<input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>
</devices> </devices>
</domain> </domain>

29
tests/xmconfigtest.c
View File

@ -33,10 +33,12 @@
#include "xen_unified.h" #include "xen_unified.h"
#include "xm_internal.h" #include "xm_internal.h"
#include "testutils.h" #include "testutils.h"
#include "conf.h" #include "testutilsxen.h"
#include "memory.h"
static char *progname; static char *progname;
static char *abs_srcdir; static char *abs_srcdir;
static virCapsPtr caps;
#define MAX_FILE 4096 #define MAX_FILE 4096
@ -54,6 +56,7 @@ static int testCompareParseXML(const char *xmcfg, const char *xml,
int wrote = MAX_FILE; int wrote = MAX_FILE;
void *old_priv = NULL; void *old_priv = NULL;
struct _xenUnifiedPrivate priv; struct _xenUnifiedPrivate priv;
virDomainDefPtr def = NULL;
conn = virConnectOpenReadOnly("test:///default"); conn = virConnectOpenReadOnly("test:///default");
if (!conn) goto fail; if (!conn) goto fail;
@ -67,9 +70,13 @@ static int testCompareParseXML(const char *xmcfg, const char *xml,
/* Many puppies died to bring you this code. */ /* Many puppies died to bring you this code. */
priv.xendConfigVersion = xendConfigVersion; priv.xendConfigVersion = xendConfigVersion;
priv.caps = caps;
conn->privateData = &priv; conn->privateData = &priv;
if (!(conf = xenXMParseXMLToConfig(conn, xmlPtr))) if (!(def = virDomainDefParseString(NULL, caps, xmlPtr)))
goto fail;
if (!(conf = xenXMDomainConfigFormat(conn, def)))
goto fail; goto fail;
if (virConfWriteMem(gotxmcfgPtr, &wrote, conf) < 0) if (virConfWriteMem(gotxmcfgPtr, &wrote, conf) < 0)
@ -86,7 +93,7 @@ static int testCompareParseXML(const char *xmcfg, const char *xml,
fail: fail:
if (conf) if (conf)
virConfFree(conf); virConfFree(conf);
virDomainDefFree(def);
if (conn) { if (conn) {
conn->privateData = old_priv; conn->privateData = old_priv;
virConnectClose(conn); virConnectClose(conn);
@ -107,6 +114,7 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml,
virConnectPtr conn; virConnectPtr conn;
void *old_priv; void *old_priv;
struct _xenUnifiedPrivate priv; struct _xenUnifiedPrivate priv;
virDomainDefPtr def = NULL;
conn = virConnectOpenReadOnly("test:///default"); conn = virConnectOpenReadOnly("test:///default");
if (!conn) goto fail; if (!conn) goto fail;
@ -120,12 +128,16 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml,
/* Many puppies died to bring you this code. */ /* Many puppies died to bring you this code. */
priv.xendConfigVersion = xendConfigVersion; priv.xendConfigVersion = xendConfigVersion;
priv.caps = caps;
conn->privateData = &priv; conn->privateData = &priv;
if (!(conf = virConfReadMem(xmcfgPtr, strlen(xmcfgPtr)))) if (!(conf = virConfReadMem(xmcfgPtr, strlen(xmcfgPtr))))
goto fail; goto fail;
if (!(gotxml = xenXMDomainFormatXML(conn, conf))) if (!(def = xenXMDomainConfigParse(conn, conf)))
goto fail;
if (!(gotxml = virDomainDefFormat(conn, def, VIR_DOMAIN_XML_SECURE)))
goto fail; goto fail;
if (STRNEQ(xmlData, gotxml)) { if (STRNEQ(xmlData, gotxml)) {
@ -138,8 +150,8 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml,
fail: fail:
if (conf) if (conf)
virConfFree(conf); virConfFree(conf);
free(gotxml); VIR_FREE(gotxml);
virDomainDefFree(def);
if (conn) { if (conn) {
conn->privateData = old_priv; conn->privateData = old_priv;
virConnectClose(conn); virConnectClose(conn);
@ -187,6 +199,8 @@ mymain(int argc, char **argv)
if (!abs_srcdir) if (!abs_srcdir)
abs_srcdir = getcwd(cwd, sizeof(cwd)); abs_srcdir = getcwd(cwd, sizeof(cwd));
if (!(caps = testXenCapsInit()))
return(EXIT_FAILURE);
#define DO_TEST(name, version) \ #define DO_TEST(name, version) \
do { \ do { \
@ -224,6 +238,9 @@ mymain(int argc, char **argv)
DO_TEST("fullvirt-sound", 2); DO_TEST("fullvirt-sound", 2);
DO_TEST("escape-paths", 2); DO_TEST("escape-paths", 2);
virCapabilitiesFree(caps);
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
} }