diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2008-07-25 13:39:02 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2008-07-25 13:39:02 +0000 |
| commit | 225fb3e93cc744133af563e4348f2dd244c9161a (patch) | |
| tree | 2545794e4d84804ff4c3ce1a8248cae27487b3b6 /tests | |
| parent | Fix test driver inactive domains and domain ID allocation (diff) | |
| download | libvirt-225fb3e93cc744133af563e4348f2dd244c9161a.tar.gz libvirt-225fb3e93cc744133af563e4348f2dd244c9161a.tar.bz2 libvirt-225fb3e93cc744133af563e4348f2dd244c9161a.zip | |
Prepare xm_internal driver for new domain XML apis
Diffstat (limited to 'tests')
45 files changed, 271 insertions, 239 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index da4c2473e..11cf3be90 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -101,7 +101,7 @@ sexpr2xmltest_SOURCES = \ sexpr2xmltest_LDADD = $(LDADDS) xmconfigtest_SOURCES = \ - xmconfigtest.c \ + xmconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h xmconfigtest_LDADD = $(LDADDS) diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg index b50c99366..6e2611b9f 100644 --- a/tests/xmconfigdata/test-escape-paths.cfg +++ b/tests/xmconfigdata/test-escape-paths.cfg @@ -20,7 +20,7 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" soundhw = "sb16,es1370" diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index 2ed6668e8..7a534baaf 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2&test</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader&test</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm&test</emulator> <disk type='block' device='disk'> @@ -32,11 +32,11 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> <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='es1370'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg index f0acaf652..9fe2721d5 100755 --- a/tests/xmconfigdata/test-fullvirt-localtime.cfg +++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml index 79d0e8a75..d4fa7e5bd 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.xml +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='localtime'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,10 +32,10 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> <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> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg index 01bb7cc52..6574ee8cf 100755 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml index d6da1162e..ab789791c 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,10 +32,10 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> <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> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg index c6eee8fa4..9f1c34c9f 100755 --- a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg +++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg @@ -21,6 +21,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml index 439a38f47..764157255 100644 --- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,10 +32,10 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr0'/> </interface> <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> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg index a03fdc7fc..598275e53 100755 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml index cbe7dfd06..125d4921e 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,15 +32,15 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <parallel type='tcp'> <source mode='connect' host='127.0.0.1' service='7777'/> <protocol type='raw'/> <target port='0'/> </parallel> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg index aed248153..6467b40d3 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "file:/tmp/serial.log" diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml index addf4ffe2..167241969 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,11 +32,9 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <serial type='file'> <source path='/tmp/serial.log'/> <target port='0'/> @@ -45,5 +43,7 @@ <source path='/tmp/serial.log'/> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg index eb3747142..698f9bc6a 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "null" diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml index cc54659a9..b2726aeeb 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,16 +32,16 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <serial type='null'> <target port='0'/> </serial> <console type='null'> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg index 2d50feea3..76b8b97db 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "pipe:/tmp/serial.pipe" diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml index 7ecc34467..aa8bbca2d 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,11 +32,9 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <serial type='pipe'> <source path='/tmp/serial.pipe'/> <target port='0'/> @@ -45,5 +43,7 @@ <source path='/tmp/serial.pipe'/> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg index 509a7f2f4..713af5a99 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "pty" diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml index 9c776cd72..da62122c2 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,16 +32,16 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg index 3bab00a48..ff3989b4b 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "stdio" diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml index 90e6d3301..af562386e 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,16 +32,16 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <serial type='stdio'> <target port='0'/> </serial> <console type='stdio'> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg index ffe7f1515..d87a02e41 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "telnet:127.0.0.1:9999,listen" diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml index 87461b922..3c528d19e 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,11 +32,9 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <serial type='tcp'> <source mode='bind' host='127.0.0.1' service='9999'/> <protocol type='telnet'/> @@ -47,5 +45,7 @@ <protocol type='telnet'/> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg index 00a4cfdfe..4f8e6c61e 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "tcp:127.0.0.1:7777" diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml index 162b59995..adfbe9234 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,11 +32,9 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <serial type='tcp'> <source mode='connect' host='127.0.0.1' service='7777'/> <protocol type='raw'/> @@ -47,5 +45,7 @@ <protocol type='raw'/> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg index 8110e8698..719aafcd6 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "udp:127.0.0.1:9999@0.0.0.0:99998" diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml index 48843b2bb..15b915471 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,20 +32,20 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <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='connect' host='127.0.0.1' service='9999'/> <target port='0'/> </serial> <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='connect' host='127.0.0.1' service='9999'/> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg index 17cb62831..fa8d988c8 100755 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "unix:/tmp/serial.sock,listen" diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml index f5d8d84e3..85bf245cd 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,11 +32,9 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> - <input type='mouse' bus='ps2'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <serial type='unix'> <source mode='bind' path='/tmp/serial.sock'/> <target port='0'/> @@ -45,5 +43,7 @@ <source mode='bind' path='/tmp/serial.sock'/> <target port='0'/> </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg index 7d77f94d2..66b7da765 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.cfg +++ b/tests/xmconfigdata/test-fullvirt-sound.cfg @@ -20,7 +20,7 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" soundhw = "sb16,es1370" diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml index 4c70a1ddb..01dd65d21 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.xml +++ b/tests/xmconfigdata/test-fullvirt-sound.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,11 +32,11 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> <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='es1370'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg index 96bba6edc..907973487 100755 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg @@ -21,6 +21,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml index c46b1356d..3d051e667 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,11 +32,11 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> <input type='mouse' bus='usb'/> <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> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml index bb2710b2f..5a0cb6946 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml @@ -32,7 +32,7 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> <input type='tablet'/> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg index ed90a04ff..f90f0876e 100755 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg @@ -21,6 +21,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml index d307f9fd9..52979bdf9 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,11 +32,11 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> <input type='tablet' bus='usb'/> <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> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg index 01bb7cc52..6574ee8cf 100755 --- a/tests/xmconfigdata/test-fullvirt-utc.cfg +++ b/tests/xmconfigdata/test-fullvirt-utc.cfg @@ -20,6 +20,6 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" serial = "none" diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml index d6da1162e..ab789791c 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.xml +++ b/tests/xmconfigdata/test-fullvirt-utc.xml @@ -1,23 +1,23 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> <os> - <type>hvm</type> + <type arch='i686' machine='xenfv'>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> - <vcpu>1</vcpu> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <features> - <pae/> <acpi/> <apic/> + <pae/> </features> <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> @@ -32,10 +32,10 @@ <readonly/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:92:9C'/> + <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> </interface> <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> </domain> diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.cfg b/tests/xmconfigdata/test-paravirt-net-e1000.cfg index 7b01e8f23..39a28f4d9 100755 --- a/tests/xmconfigdata/test-paravirt-net-e1000.cfg +++ b/tests/xmconfigdata/test-paravirt-net-e1000.cfg @@ -9,4 +9,4 @@ on_reboot = "restart" on_crash = "restart" vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ] 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" ] diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml index fc0ff8536..8efab5871 100644 --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml @@ -1,28 +1,33 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <bootloader>/usr/bin/pygrub</bootloader> - <currentMemory>403456</currentMemory> <memory>592896</memory> + <currentMemory>403456</currentMemory> <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_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> <target dev='xvda' bus='xen'/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:94:9C'/> - <ip address='192.168.0.9'/> + <mac address='00:16:3e:66:94:9c'/> + <source bridge='br0'/> <model type='e1000'/> </interface> - <input type='mouse' bus='xen'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <console type='pty'> <target port='0'/> </console> + <input type='mouse' bus='xen'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.cfg b/tests/xmconfigdata/test-paravirt-new-pvfb.cfg index 76a6eae1a..b47a4ad63 100755 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.cfg +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.cfg @@ -9,4 +9,4 @@ on_reboot = "restart" on_crash = "restart" vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ] 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" ] diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml index b82cee646..620f701e0 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml @@ -1,27 +1,32 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <bootloader>/usr/bin/pygrub</bootloader> - <currentMemory>403456</currentMemory> <memory>592896</memory> + <currentMemory>403456</currentMemory> <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_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> <target dev='xvda' bus='xen'/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:94:9C'/> - <ip address='192.168.0.9'/> + <mac address='00:16:3e:66:94:9c'/> + <source bridge='br0'/> </interface> - <input type='mouse' bus='xen'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <console type='pty'> <target port='0'/> </console> + <input type='mouse' bus='xen'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg index f37b28680..c60a3ea2d 100755 --- a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg +++ b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg @@ -13,4 +13,4 @@ vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" 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" ] diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml index b82cee646..620f701e0 100644 --- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml @@ -1,27 +1,32 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <bootloader>/usr/bin/pygrub</bootloader> - <currentMemory>403456</currentMemory> <memory>592896</memory> + <currentMemory>403456</currentMemory> <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_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> <target dev='xvda' bus='xen'/> </disk> <interface type='bridge'> - <mac address='00:16:3E:66:94:9C'/> - <ip address='192.168.0.9'/> + <mac address='00:16:3e:66:94:9c'/> + <source bridge='br0'/> </interface> - <input type='mouse' bus='xen'/> - <graphics type='vnc' port='-1' listen='127.0.0.1' passwd='123poi'/> <console type='pty'> <target port='0'/> </console> + <input type='mouse' bus='xen'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> </devices> </domain> diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 389bf287d..5c2eeb1c5 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -33,10 +33,12 @@ #include "xen_unified.h" #include "xm_internal.h" #include "testutils.h" -#include "conf.h" +#include "testutilsxen.h" +#include "memory.h" static char *progname; static char *abs_srcdir; +static virCapsPtr caps; #define MAX_FILE 4096 @@ -54,6 +56,7 @@ static int testCompareParseXML(const char *xmcfg, const char *xml, int wrote = MAX_FILE; void *old_priv = NULL; struct _xenUnifiedPrivate priv; + virDomainDefPtr def = NULL; conn = virConnectOpenReadOnly("test:///default"); 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. */ priv.xendConfigVersion = xendConfigVersion; + priv.caps = caps; conn->privateData = &priv; - if (!(conf = xenXMParseXMLToConfig(conn, xmlPtr))) + if (!(def = virDomainDefParseString(NULL, caps, xmlPtr))) + goto fail; + + if (!(conf = xenXMDomainConfigFormat(conn, def))) goto fail; if (virConfWriteMem(gotxmcfgPtr, &wrote, conf) < 0) @@ -86,7 +93,7 @@ static int testCompareParseXML(const char *xmcfg, const char *xml, fail: if (conf) virConfFree(conf); - + virDomainDefFree(def); if (conn) { conn->privateData = old_priv; virConnectClose(conn); @@ -107,6 +114,7 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml, virConnectPtr conn; void *old_priv; struct _xenUnifiedPrivate priv; + virDomainDefPtr def = NULL; conn = virConnectOpenReadOnly("test:///default"); 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. */ priv.xendConfigVersion = xendConfigVersion; + priv.caps = caps; conn->privateData = &priv; if (!(conf = virConfReadMem(xmcfgPtr, strlen(xmcfgPtr)))) 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; if (STRNEQ(xmlData, gotxml)) { @@ -138,8 +150,8 @@ static int testCompareFormatXML(const char *xmcfg, const char *xml, fail: if (conf) virConfFree(conf); - free(gotxml); - + VIR_FREE(gotxml); + virDomainDefFree(def); if (conn) { conn->privateData = old_priv; virConnectClose(conn); @@ -187,6 +199,8 @@ mymain(int argc, char **argv) if (!abs_srcdir) abs_srcdir = getcwd(cwd, sizeof(cwd)); + if (!(caps = testXenCapsInit())) + return(EXIT_FAILURE); #define DO_TEST(name, version) \ do { \ @@ -224,6 +238,9 @@ mymain(int argc, char **argv) DO_TEST("fullvirt-sound", 2); DO_TEST("escape-paths", 2); + + virCapabilitiesFree(caps); + return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } |