External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xen: tests: use latest XEND_CONFIG_VERSION in sexpr2xml tests

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

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2015-12-09 21:15:07 -07:00
parent 7d7c08be1c
commit 87dce7a762
51 changed files with 168 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<pae/> <pae/>
</features> </features>
<clock offset='localtime' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='localtime'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot> <on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>

4
tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
View File

@ -3,7 +3,9 @@
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\ (image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot d)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot d)(cdrom '/root/boot.iso')\
(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'hda')\
(uname 'file:/root/foo.img')(mode 'w')))\ (uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -41,7 +41,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

4
tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
View File

@ -2,8 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\ (acpi 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
(model 'e1000')(type ioemu))))\ (model 'e1000')(type ioemu))))\

4
tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'> <clock offset='variable' adjustment='0' basis='utc'>
<timer name='hpet' present='yes'/> <timer name='hpet' present='yes'/>
</clock> </clock>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
@ -44,7 +44,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

4
tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
View File

@ -2,8 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\ (acpi 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
(model 'e1000')(type ioemu))))\ (model 'e1000')(type ioemu))))\

4
tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'> <clock offset='variable' adjustment='0' basis='utc'>
<timer name='hpet' present='no'/> <timer name='hpet' present='no'/>
</clock> </clock>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
@ -44,7 +44,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

2
tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
View File

@ -11,7 +11,7 @@
<initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
<cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline>
</os> </os>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot> <on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>

3
tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
View File

@ -2,8 +2,9 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
(acpi 1)(vnc 1)(keymap ja)(localtime 1)))\ (acpi 1)(vnc 1)(keymap ja)(localtime 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='localtime' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -41,7 +41,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

4
tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
View File

@ -2,8 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
(uname 'file:/root/foo.img')(mode 'w')))\ (uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type 'netfront')))) (script 'vif-bridge')(type 'netfront'))))

4
tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -42,7 +42,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

3
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
View File

@ -2,8 +2,9 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\ (acpi 1)(usb 1)(parallel tcp:localhost:9999)\
(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -46,7 +46,7 @@
</parallel> </parallel>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

5
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
View File

@ -5,5 +5,8 @@
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\ (serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -53,7 +53,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
View File

@ -2,8 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (acpi 1)(usb 1)(parallel none)\
(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -49,7 +49,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

7
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
View File

@ -2,8 +2,11 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (acpi 1)(usb 1)(parallel none)\
(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\ (serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -49,7 +49,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

3
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
View File

@ -2,8 +2,9 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\ (acpi 1)(usb 1)(parallel none)(serial null)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -47,7 +47,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

7
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
View File

@ -2,8 +2,11 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (acpi 1)(usb 1)(parallel none)\
(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\ (serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -49,7 +49,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
View File

@ -2,8 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\ (acpi 1)(usb 1)(parallel none)(serial pty)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -47,7 +47,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

3
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
View File

@ -2,8 +2,9 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\ (acpi 1)(usb 1)(parallel none)(serial stdio)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
(type ioemu)))) (type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -47,7 +47,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

3
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
View File

@ -2,9 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (acpi 1)(usb 1)(parallel none)\
(serial telnet:localhost:9999,server,nowait)\ (serial telnet:localhost:9999,server,nowait)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -51,7 +51,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

3
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
View File

@ -2,9 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (acpi 1)(usb 1)(parallel none)\
(serial tcp:localhost:9999,server,nowait)\ (serial tcp:localhost:9999,server,nowait)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -51,7 +51,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

3
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
View File

@ -2,9 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (acpi 1)(usb 1)(parallel none)\
(serial udp:localhost:9998@localhost:9999)\ (serial udp:localhost:9998@localhost:9999)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -51,7 +51,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

3
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
View File

@ -2,9 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (acpi 1)(usb 1)(parallel none)\
(serial unix:/tmp/serial.sock,server,nowait)\ (serial unix:/tmp/serial.sock,server,nowait)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -49,7 +49,7 @@
</console> </console>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/> <graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

4
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
View File

@ -2,8 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
(acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')\ (acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')\
(uname 'file:/root/foo.img')(mode 'w')))\ (uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -41,7 +41,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<sound model='sb16'/> <sound model='sb16'/>
<sound model='es1370'/> <sound model='es1370'/>
<memballoon model='xen'/> <memballoon model='xen'/>

3
tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
View File

@ -2,8 +2,9 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
(acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\ (acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -41,7 +41,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<sound model='sb16'/> <sound model='sb16'/>
<sound model='es1370'/> <sound model='es1370'/>
<memballoon model='xen'/> <memballoon model='xen'/>

3
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
View File

@ -2,8 +2,9 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
(acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\ (acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -42,7 +42,7 @@
<input type='mouse' bus='usb'/> <input type='mouse' bus='usb'/>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

3
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
View File

@ -2,8 +2,9 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
(acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\ (acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -42,7 +42,7 @@
<input type='tablet' bus='usb'/> <input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

2
tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
View File

@ -5,5 +5,7 @@
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
(uname 'file:/root/foo.img')(mode 'w')))\ (uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -41,7 +41,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

2
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>

4
tests/sexpr2xmldata/sexpr2xml-fv.sexpr
View File

@ -2,8 +2,10 @@
(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ (device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\
(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
(uname 'file:/root/foo.img')(mode 'w')))\ (uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\
(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type ioemu)))) (script 'vif-bridge')(type ioemu))))

4
tests/sexpr2xmldata/sexpr2xml-fv.xml
View File

@ -12,7 +12,7 @@
<features> <features>
<acpi/> <acpi/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='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>
@ -41,7 +41,7 @@
</interface> </interface>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no' keymap='ja'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<memballoon model='xen'/> <memballoon model='xen'/>
</devices> </devices>
</domain> </domain>

2
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
View File

@ -14,7 +14,7 @@
<apic/> <apic/>
<pae/> <pae/>
</features> </features>
<clock offset='utc' adjustment='reset'/> <clock offset='variable' adjustment='0' basis='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot> <on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>

113
tests/sexpr2xmltest.c
View File

@ -20,7 +20,7 @@ static virCapsPtr caps;
static virDomainXMLOptionPtr xmlopt; static virDomainXMLOptionPtr xmlopt;
static int static int
testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion) testCompareFiles(const char *xml, const char *sexpr)
{ {
char *sexprData = NULL; char *sexprData = NULL;
char *gotxml = NULL; char *gotxml = NULL;
@ -41,20 +41,20 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
memset(&priv, 0, sizeof(priv)); memset(&priv, 0, sizeof(priv));
/* Many puppies died to bring you this code. */ /* Many puppies died to bring you this code. */
priv.xendConfigVersion = xendConfigVersion; priv.xendConfigVersion = 4;
priv.caps = caps; priv.caps = caps;
conn->privateData = &priv; conn->privateData = &priv;
if (virMutexInit(&priv.lock) < 0) if (virMutexInit(&priv.lock) < 0)
goto fail; goto fail;
if (xenGetDomIdFromSxprString(sexprData, xendConfigVersion, &id) < 0) if (xenGetDomIdFromSxprString(sexprData, 4, &id) < 0)
goto fail; goto fail;
xenUnifiedLock(&priv); xenUnifiedLock(&priv);
tty = xenStoreDomainGetConsolePath(conn, id); tty = xenStoreDomainGetConsolePath(conn, id);
vncport = xenStoreDomainGetVNCPort(conn, id); vncport = xenStoreDomainGetVNCPort(conn, id);
xenUnifiedUnlock(&priv); xenUnifiedUnlock(&priv);
if (!(def = xenParseSxprString(sexprData, xendConfigVersion, if (!(def = xenParseSxprString(sexprData, 4,
tty, vncport, caps, xmlopt))) tty, vncport, caps, xmlopt)))
goto fail; goto fail;
@ -83,7 +83,6 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
struct testInfo { struct testInfo {
const char *input; const char *input;
const char *output; const char *output;
int version;
}; };
static int static int
@ -101,7 +100,7 @@ testCompareHelper(const void *data)
goto cleanup; goto cleanup;
} }
result = testCompareFiles(xml, args, info->version); result = testCompareFiles(xml, args);
cleanup: cleanup:
VIR_FREE(xml); VIR_FREE(xml);
@ -123,72 +122,72 @@ mymain(void)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
#define DO_TEST(in, out, version) \ #define DO_TEST(in, out) \
do { \ do { \
struct testInfo info = { in, out, version }; \ struct testInfo info = { in, out }; \
virResetLastError(); \ virResetLastError(); \
if (virtTestRun("Xen SEXPR-2-XML " in " -> " out, \ if (virtTestRun("Xen SEXPR-2-XML " in " -> " out, \
testCompareHelper, &info) < 0) \ testCompareHelper, &info) < 0) \
ret = -1; \ ret = -1; \
} while (0) } while (0)
DO_TEST("pv", "pv", 1); DO_TEST("pv", "pv");
DO_TEST("fv", "fv", 1); DO_TEST("fv", "fv");
DO_TEST("pv", "pv", 2); DO_TEST("pv", "pv");
DO_TEST("fv-v2", "fv-v2", 2); DO_TEST("fv-v2", "fv-v2");
DO_TEST("pv-vfb-new", "pv-vfb-new", 3); DO_TEST("pv-vfb-new", "pv-vfb-new");
DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay", 3); DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay");
DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash", 3); DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash");
DO_TEST("fv-autoport", "fv-autoport", 3); DO_TEST("fv-autoport", "fv-autoport");
DO_TEST("pv-bootloader", "pv-bootloader", 1); DO_TEST("pv-bootloader", "pv-bootloader");
DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline", 1); DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline");
DO_TEST("pv-vcpus", "pv-vcpus", 1); DO_TEST("pv-vcpus", "pv-vcpus");
DO_TEST("disk-file", "disk-file", 2); DO_TEST("disk-file", "disk-file");
DO_TEST("disk-block", "disk-block", 2); DO_TEST("disk-block", "disk-block");
DO_TEST("disk-block-shareable", "disk-block-shareable", 2); DO_TEST("disk-block-shareable", "disk-block-shareable");
DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw", 2); DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw");
DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", 2); DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow");
DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw", 2); DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw");
DO_TEST("curmem", "curmem", 2); DO_TEST("curmem", "curmem");
DO_TEST("net-routed", "net-routed", 2); DO_TEST("net-routed", "net-routed");
DO_TEST("net-bridged", "net-bridged", 2); DO_TEST("net-bridged", "net-bridged");
DO_TEST("net-e1000", "net-e1000", 2); DO_TEST("net-e1000", "net-e1000");
DO_TEST("bridge-ipaddr", "bridge-ipaddr", 3); DO_TEST("bridge-ipaddr", "bridge-ipaddr");
DO_TEST("no-source-cdrom", "no-source-cdrom", 2); DO_TEST("no-source-cdrom", "no-source-cdrom");
DO_TEST("pv-localtime", "pv-localtime", 2); DO_TEST("pv-localtime", "pv-localtime");
DO_TEST("pci-devs", "pci-devs", 2); DO_TEST("pci-devs", "pci-devs");
DO_TEST("fv-utc", "fv-utc", 1); DO_TEST("fv-utc", "fv-utc");
DO_TEST("fv-localtime", "fv-localtime", 1); DO_TEST("fv-localtime", "fv-localtime");
DO_TEST("fv-usbmouse", "fv-usbmouse", 1); DO_TEST("fv-usbmouse", "fv-usbmouse");
DO_TEST("fv-usbtablet", "fv-usbtablet", 1); DO_TEST("fv-usbtablet", "fv-usbtablet");
DO_TEST("fv-kernel", "fv-kernel", 1); DO_TEST("fv-kernel", "fv-kernel");
DO_TEST("fv-force-hpet", "fv-force-hpet", 1); DO_TEST("fv-force-hpet", "fv-force-hpet");
DO_TEST("fv-force-nohpet", "fv-force-nohpet", 1); DO_TEST("fv-force-nohpet", "fv-force-nohpet");
DO_TEST("fv-serial-null", "fv-serial-null", 1); DO_TEST("fv-serial-null", "fv-serial-null");
DO_TEST("fv-serial-file", "fv-serial-file", 1); DO_TEST("fv-serial-file", "fv-serial-file");
DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports", 1); DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports");
DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port", 1); DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port");
DO_TEST("fv-serial-stdio", "fv-serial-stdio", 1); DO_TEST("fv-serial-stdio", "fv-serial-stdio");
DO_TEST("fv-serial-pty", "fv-serial-pty", 1); DO_TEST("fv-serial-pty", "fv-serial-pty");
DO_TEST("fv-serial-pipe", "fv-serial-pipe", 1); DO_TEST("fv-serial-pipe", "fv-serial-pipe");
DO_TEST("fv-serial-tcp", "fv-serial-tcp", 1); DO_TEST("fv-serial-tcp", "fv-serial-tcp");
DO_TEST("fv-serial-udp", "fv-serial-udp", 1); DO_TEST("fv-serial-udp", "fv-serial-udp");
DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet", 1); DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet");
DO_TEST("fv-serial-unix", "fv-serial-unix", 1); DO_TEST("fv-serial-unix", "fv-serial-unix");
DO_TEST("fv-parallel-tcp", "fv-parallel-tcp", 1); DO_TEST("fv-parallel-tcp", "fv-parallel-tcp");
DO_TEST("fv-sound", "fv-sound", 1); DO_TEST("fv-sound", "fv-sound");
DO_TEST("fv-sound-all", "fv-sound-all", 1); DO_TEST("fv-sound-all", "fv-sound-all");
DO_TEST("fv-net-netfront", "fv-net-netfront", 1); DO_TEST("fv-net-netfront", "fv-net-netfront");
DO_TEST("fv-empty-kernel", "fv-empty-kernel", 1); DO_TEST("fv-empty-kernel", "fv-empty-kernel");
DO_TEST("boot-grub", "boot-grub", 1); DO_TEST("boot-grub", "boot-grub");
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(xmlopt); virObjectUnref(xmlopt);