Xen: tests: use latest XEND_CONFIG_VERSION in xml2sexpr tests

Change all xml2sexpr 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-13 23:41:48 -07:00
parent bec993d60a
commit f2b4a65728
50 changed files with 208 additions and 157 deletions

View File

@ -1,6 +1,6 @@
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ (vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
(on_reboot 'destroy')(on_crash 'destroy')(image (linux \ (on_reboot 'destroy')(on_crash 'destroy')(image (linux \
(kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')))\ (kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')\
(localtime 0)\ (localtime 0)))(localtime 0)\
(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\ (device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'xvda')\ (device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w')))\ (uname 'file:/root/some.img')(mode 'w')))\

View File

@ -1,7 +1,7 @@
(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\ (vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\
(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\ (uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\
(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\ (on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
(localtime 0)\ (image (linux (localtime 0)))(localtime 0)\
(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\ (device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\
(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\
(script 'vif-bridge'))))\ (script 'vif-bridge'))))\

View File

@ -1,7 +1,7 @@
(vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\ (vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\
(uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')\ (uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')\
(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\ (on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
(image (linux (args 'ro root=/dev/VolGroup00/LogVol00')))\ (image (linux (args 'ro root=/dev/VolGroup00/LogVol00')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\ (device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\
(mode 'w!')))\ (mode 'w!')))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'xvda')\ (device (vbd (dev 'xvda')\
(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\ (uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'xvda')\ (device (vbd (dev 'xvda')\
(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\ (uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (tap (dev 'xvda')\ (device (tap (dev 'xvda')\
(uname 'tap:qcow:/root/some.img')(mode 'w'))))\ (uname 'tap:qcow:/root/some.img')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (tap (dev 'xvda')\ (device (tap (dev 'xvda')\
(uname 'tap:aio:/root/some.img')(mode 'w'))))\ (uname 'tap:aio:/root/some.img')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (tap (dev 'xvda')\ (device (tap (dev 'xvda')\
(uname 'tap:aio:/root/some.img')(mode 'w'))))\ (uname 'tap:aio:/root/some.img')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (tap2 (dev 'xvda')\ (device (tap2 (dev 'xvda')\
(uname 'tap2:aio:/root/some.img')(mode 'w'))))\ (uname 'tap2:aio:/root/some.img')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (tap2 (dev 'xvda')\ (device (tap2 (dev 'xvda')\
(uname 'tap2:aio:/root/some.img')(mode 'w'))))\ (uname 'tap2:aio:/root/some.img')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'xvda')\ (device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w'))))\ (uname 'file:/root/some.img')(mode 'w'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'xvda')\ (device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w'))))\ (uname 'file:/root/some.img')(mode 'w'))))\

View File

@ -6,6 +6,6 @@
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os&version="devel" ')\ core/test/5.91/x86_64/os&version="devel" ')\
(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\ (loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\
(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))\ (serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')(rtc_timeoffset 0)\
(localtime 0)\ (localtime 0)))(localtime 0)\
(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w'))))\ (device (vbd (dev 'xvda:disk')(uname 'file:/root/\'\\some.img')(mode 'w'))))

View File

@ -3,8 +3,10 @@
(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)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -3,8 +3,10 @@
(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)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -6,6 +6,7 @@
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\ core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
(boot c)(usb 1)(parallel none)(serial pty)\ (boot c)(usb 1)(parallel none)(serial pty)\
(device_model '/usr/lib/xen/bin/qemu-dm')))\ (device_model '/usr/lib/xen/bin/qemu-dm')\
(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))\ (device (vbd (dev 'xvda:disk')(uname 'file:/root/some.img')(mode 'w'))))\

View File

@ -3,8 +3,10 @@
(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)\
(acpi 1)(usb 1)(parallel none)(serial none)\ (acpi 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 1)))\
(localtime 1)\ (localtime 1)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -3,7 +3,8 @@
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\ (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)))(localtime 0)\ (vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (localtime 0)\
(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
(script 'vif-bridge')(type netfront))))\ (script 'vif-bridge')(type netfront))))\

View File

@ -3,8 +3,10 @@
(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)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -4,7 +4,10 @@
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\ (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)))(localtime 0)\ (vnc 1)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (localtime 0)\
(script 'vif-bridge')(model 'e1000')(type ioemu))))\ (device (vbd (dev 'hda:disk')(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')(model 'e1000'))))\

View File

@ -3,8 +3,10 @@
(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)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -4,7 +4,10 @@
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(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)))(localtime 0)\ (vnc 1)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (localtime 0)\
(script 'vif-bridge')(model 'e1000')(type ioemu))))\ (device (vbd (dev 'hda:disk')(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')(model 'e1000'))))\

View File

@ -3,8 +3,10 @@
(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)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -4,7 +4,10 @@
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(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)))(localtime 0)\ (vnc 1)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ (localtime 0)\
(script 'vif-bridge')(model 'e1000')(type ioemu))))\ (device (vbd (dev 'hda:disk')(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')(model 'e1000'))))\

View File

@ -3,8 +3,10 @@
(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)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))

View File

@ -3,8 +3,10 @@
(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)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -4,8 +4,10 @@
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -4,8 +4,10 @@
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -4,8 +4,10 @@
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -4,8 +4,10 @@
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(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)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -3,8 +3,10 @@
(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)\
(acpi 1)(usb 1)(parallel none)(serial none)\ (acpi 1)(usb 1)(parallel none)(serial none)\
(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -3,8 +3,10 @@
(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)\
(acpi 1)(usb 1)(usbdevice mouse)(parallel none)\ (acpi 1)(usb 1)(usbdevice mouse)(parallel none)\
(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -3,8 +3,10 @@
(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)\
(acpi 1)(usb 1)(parallel none)(serial none)\ (acpi 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -3,9 +3,9 @@
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\ (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))\ (vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ (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'))))\

View File

@ -3,9 +3,9 @@
(on_reboot 'restart')(on_crash 'restart')\ (on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\ (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)(vncunused 1)(keymap 'ja')))\ (vnc 1)(vncunused 1)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)(device (vbd (dev 'hda:disk')\ (localtime 0)(device (vbd (dev 'hda:disk')\
(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')\ (uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')\
(uname 'file:/root/boot.iso')(mode 'r')))\ (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'))))\

View File

@ -3,8 +3,10 @@
(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)\
(acpi 1)(usb 1)(parallel none)(serial none)\ (acpi 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hda:disk')(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'))))\

View File

@ -4,7 +4,8 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))(localtime 0)(device (vbd (dev 'xvda')\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)(device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w')))\ (uname 'file:/root/some.img')(mode 'w')))\
(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\ (device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
(script 'vif-bridge'))))\ (script 'vif-bridge'))))\

View File

@ -4,7 +4,8 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))(localtime 0)(device (vbd (dev 'xvda')\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)(device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w')))\ (uname 'file:/root/some.img')(mode 'w')))\
(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\ (device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
(script 'vif-bridge')(model 'e1000'))))\ (script 'vif-bridge')(model 'e1000'))))\

View File

@ -4,7 +4,8 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))(localtime 0)(device (vbd (dev 'xvda')\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)(device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w')))\ (uname 'file:/root/some.img')(mode 'w')))\
(device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')\ (device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')\
(ip '172.14.5.6'))))\ (ip '172.14.5.6'))))\

View File

@ -3,8 +3,8 @@
(on_reboot 'destroy')(on_crash 'destroy')\ (on_reboot 'destroy')(on_crash 'destroy')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
(apic 1)(pae 1)(usb 1)(parallel none)(serial none)\ (apic 1)(pae 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)))\ (device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)\
(localtime 0)\ (rtc_timeoffset 0)(localtime 0)))(localtime 0)\
(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))\ (device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))\
(device (vbd (dev 'hdc:cdrom')(mode 'r')))\ (device (vbd (dev 'hdc:cdrom')(mode 'r')))\
(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu))))\ (device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000'))))\

View File

@ -4,7 +4,7 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))(localtime 0)(device (vbd (dev 'xvda')\ core/test/5.91/x86_64/os ')(localtime 0)))(localtime 0)(device (vbd (dev 'xvda')\
(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))\ (uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))\
(device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))\ (device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))\
(dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\ (dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\

View File

@ -1,6 +1,6 @@
(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ (vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\ (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\
(bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\ (bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\
(on_crash 'destroy')(image (linux (args 'xenfb.video=8,1280,1024')))\ (on_crash 'destroy')(image (linux (args 'xenfb.video=8,1280,1024')(localtime 0)))\
(localtime 0)\ (localtime 0)\
(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\ (device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\

View File

@ -2,6 +2,6 @@
(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\ (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\
(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\ (bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\
(on_reboot 'destroy')(on_crash 'destroy')\ (on_reboot 'destroy')(on_crash 'destroy')\
(localtime 0)\ (image (linux (localtime 0)))(localtime 0)\
(device (vbd (dev 'xvda')\ (device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w'))))\ (uname 'file:/root/some.img')(mode 'w'))))\

View File

@ -1,6 +1,8 @@
(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\ (vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\
(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\ (uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\
(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(localtime 1)\ (on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
(image (linux (localtime 1)))(localtime 1)\
(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\ (device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\
(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\ (device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\
(script 'vif-bridge'))))\ (script 'vif-bridge')))\
(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 5))))

View File

@ -4,5 +4,6 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))(localtime 0)(device (vbd (dev 'xvda')\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)(device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w'))))\ (uname 'file:/root/some.img')(mode 'w'))))\

View File

@ -4,7 +4,8 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))(localtime 0)(device (vbd (dev 'xvda')\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)(device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\ (uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
(device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')\ (device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')\
(vncpasswd '123456')(keymap 'ja'))))\ (vncpasswd '123456')(keymap 'ja'))))\

View File

@ -4,7 +4,8 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))(localtime 0)(device (vbd (dev 'xvda')\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)(device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\ (uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\ (device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\
(vncpasswd '123456')(keymap 'ja'))))\ (vncpasswd '123456')(keymap 'ja'))))\

View File

@ -4,5 +4,6 @@
(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')))(localtime 0)(device (vbd (dev 'xvda')\ core/test/5.91/x86_64/os ')(localtime 0)))\
(localtime 0)(device (vbd (dev 'xvda')\
(uname 'file:/root/some.img')(mode 'w'))))\ (uname 'file:/root/some.img')(mode 'w'))))\

View File

@ -21,7 +21,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 *gotsexpr = NULL; char *gotsexpr = NULL;
int ret = -1; int ret = -1;
@ -36,7 +36,7 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion)
goto fail; goto fail;
} }
if (!(gotsexpr = xenFormatSxpr(NULL, def, xendConfigVersion))) if (!(gotsexpr = xenFormatSxpr(NULL, def, 4)))
goto fail; goto fail;
if (virtTestCompareToFile(gotsexpr, sexpr) < 0) if (virtTestCompareToFile(gotsexpr, sexpr) < 0)
@ -55,7 +55,6 @@ struct testInfo {
const char *input; const char *input;
const char *output; const char *output;
const char *name; const char *name;
int version;
}; };
static int static int
@ -73,7 +72,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);
@ -87,9 +86,9 @@ mymain(void)
{ {
int ret = 0; int ret = 0;
#define DO_TEST(in, out, name, version) \ #define DO_TEST(in, out, name) \
do { \ do { \
struct testInfo info = { in, out, name, version }; \ struct testInfo info = { in, out, name }; \
virResetLastError(); \ virResetLastError(); \
if (virtTestRun("Xen XML-2-SEXPR " in " -> " out, \ if (virtTestRun("Xen XML-2-SEXPR " in " -> " out, \
testCompareHelper, &info) < 0) \ testCompareHelper, &info) < 0) \
@ -102,64 +101,64 @@ mymain(void)
if (!(xmlopt = xenDomainXMLConfInit())) if (!(xmlopt = xenDomainXMLConfInit()))
return EXIT_FAILURE; return EXIT_FAILURE;
DO_TEST("pv", "pv", "pvtest", 1); DO_TEST("pv", "pv", "pvtest");
DO_TEST("fv", "fv", "fvtest", 1); DO_TEST("fv", "fv", "fvtest");
DO_TEST("pv", "pv", "pvtest", 2); DO_TEST("pv", "pv", "pvtest");
DO_TEST("fv", "fv-v2", "fvtest", 2); DO_TEST("fv", "fv-v2", "fvtest");
DO_TEST("fv-vncunused", "fv-vncunused", "fvtest", 2); DO_TEST("fv-vncunused", "fv-vncunused", "fvtest");
DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest", 3); DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest");
DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto", "pvtest", 3); DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto", "pvtest");
DO_TEST("pv-bootloader", "pv-bootloader", "pvtest", 1); DO_TEST("pv-bootloader", "pv-bootloader", "pvtest");
DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline", "pvtest", 1); DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline", "pvtest");
DO_TEST("pv-vcpus", "pv-vcpus", "pvtest", 1); DO_TEST("pv-vcpus", "pv-vcpus", "pvtest");
DO_TEST("disk-file", "disk-file", "pvtest", 2); DO_TEST("disk-file", "disk-file", "pvtest");
DO_TEST("disk-block", "disk-block", "pvtest", 2); DO_TEST("disk-block", "disk-block", "pvtest");
DO_TEST("disk-block-shareable", "disk-block-shareable", "pvtest", 2); DO_TEST("disk-block-shareable", "disk-block-shareable", "pvtest");
DO_TEST("disk-drv-loop", "disk-drv-loop", "pvtest", 2); DO_TEST("disk-drv-loop", "disk-drv-loop", "pvtest");
DO_TEST("disk-drv-blkback", "disk-drv-blkback", "pvtest", 2); DO_TEST("disk-drv-blkback", "disk-drv-blkback", "pvtest");
DO_TEST("disk-drv-blktap", "disk-drv-blktap", "pvtest", 2); DO_TEST("disk-drv-blktap", "disk-drv-blktap", "pvtest");
DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw", "pvtest", 2); DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw", "pvtest");
DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", "pvtest", 2); DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", "pvtest");
DO_TEST("disk-drv-blktap2", "disk-drv-blktap2", "pvtest", 2); DO_TEST("disk-drv-blktap2", "disk-drv-blktap2", "pvtest");
DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw", "pvtest", 2); DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw", "pvtest");
DO_TEST("curmem", "curmem", "rhel5", 2); DO_TEST("curmem", "curmem", "rhel5");
DO_TEST("net-routed", "net-routed", "pvtest", 2); DO_TEST("net-routed", "net-routed", "pvtest");
DO_TEST("net-bridged", "net-bridged", "pvtest", 2); DO_TEST("net-bridged", "net-bridged", "pvtest");
DO_TEST("net-e1000", "net-e1000", "pvtest", 2); DO_TEST("net-e1000", "net-e1000", "pvtest");
DO_TEST("bridge-ipaddr", "bridge-ipaddr", "pvtest", 2); DO_TEST("bridge-ipaddr", "bridge-ipaddr", "pvtest");
DO_TEST("no-source-cdrom", "no-source-cdrom", "test", 2); DO_TEST("no-source-cdrom", "no-source-cdrom", "test");
DO_TEST("pv-localtime", "pv-localtime", "pvtest", 1); DO_TEST("pv-localtime", "pv-localtime", "pvtest");
DO_TEST("pci-devs", "pci-devs", "pvtest", 2); DO_TEST("pci-devs", "pci-devs", "pvtest");
DO_TEST("fv-utc", "fv-utc", "fvtest", 1); DO_TEST("fv-utc", "fv-utc", "fvtest");
DO_TEST("fv-localtime", "fv-localtime", "fvtest", 1); DO_TEST("fv-localtime", "fv-localtime", "fvtest");
DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest", 1); DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest");
DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest", 1); DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest");
DO_TEST("fv-kernel", "fv-kernel", "fvtest", 1); DO_TEST("fv-kernel", "fv-kernel", "fvtest");
DO_TEST("fv-force-hpet", "fv-force-hpet", "fvtest", 1); DO_TEST("fv-force-hpet", "fv-force-hpet", "fvtest");
DO_TEST("fv-force-nohpet", "fv-force-nohpet", "fvtest", 1); DO_TEST("fv-force-nohpet", "fv-force-nohpet", "fvtest");
DO_TEST("fv-serial-null", "fv-serial-null", "fvtest", 1); DO_TEST("fv-serial-null", "fv-serial-null", "fvtest");
DO_TEST("fv-serial-file", "fv-serial-file", "fvtest", 1); DO_TEST("fv-serial-file", "fv-serial-file", "fvtest");
DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports", "fvtest", 1); DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports", "fvtest");
DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port", "fvtest", 1); DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port", "fvtest");
DO_TEST("fv-serial-stdio", "fv-serial-stdio", "fvtest", 1); DO_TEST("fv-serial-stdio", "fv-serial-stdio", "fvtest");
DO_TEST("fv-serial-pty", "fv-serial-pty", "fvtest", 1); DO_TEST("fv-serial-pty", "fv-serial-pty", "fvtest");
DO_TEST("fv-serial-pipe", "fv-serial-pipe", "fvtest", 1); DO_TEST("fv-serial-pipe", "fv-serial-pipe", "fvtest");
DO_TEST("fv-serial-tcp", "fv-serial-tcp", "fvtest", 1); DO_TEST("fv-serial-tcp", "fv-serial-tcp", "fvtest");
DO_TEST("fv-serial-udp", "fv-serial-udp", "fvtest", 1); DO_TEST("fv-serial-udp", "fv-serial-udp", "fvtest");
DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet", "fvtest", 1); DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet", "fvtest");
DO_TEST("fv-serial-unix", "fv-serial-unix", "fvtest", 1); DO_TEST("fv-serial-unix", "fv-serial-unix", "fvtest");
DO_TEST("fv-parallel-tcp", "fv-parallel-tcp", "fvtest", 1); DO_TEST("fv-parallel-tcp", "fv-parallel-tcp", "fvtest");
DO_TEST("fv-sound", "fv-sound", "fvtest", 1); DO_TEST("fv-sound", "fv-sound", "fvtest");
DO_TEST("fv-net-netfront", "fv-net-netfront", "fvtest", 1); DO_TEST("fv-net-netfront", "fv-net-netfront", "fvtest");
DO_TEST("boot-grub", "boot-grub", "fvtest", 1); DO_TEST("boot-grub", "boot-grub", "fvtest");
DO_TEST("escape", "escape", "fvtest", 1); DO_TEST("escape", "escape", "fvtest");
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(xmlopt); virObjectUnref(xmlopt);