Attachment #3707 for bug #24266




{
    const struct sexpr *cur, *node;
    virDomainDiskDefPtr disk = NULL;
    int bootIndex = 0;

    for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
        node = cur->u.s.car;

                strchr(mode, '!'))
                disk->shared = 1;

            if (STREQ_NULLABLE(bootable, "1"))
                disk->bootIndex = ++bootIndex;

            if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
                goto no_memory;

            def->disks[def->ndisks++] = disk;
            if (STREQ_NULLABLE(bootable, "1")) {
                def->disks[def->ndisks++] = def->disks[0];
                def->disks[0] = disk;
            } else {
                def->disks[def->ndisks++] = disk;
            }
            disk = NULL;
        }
    }

        virBufferAddLit(buf, "(mode 'w!')");
    else
        virBufferAddLit(buf, "(mode 'w')");

    if (def->bootIndex)
        virBufferAddLit(buf, "(bootable 1)");
    else
        virBufferAddLit(buf, "(bootable 0)");

    if (def->transient) {
        XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
                    _("transient disks not supported yet"));

Lines 22-27 Link Here

(-)a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml (+1 lines)
22	<driver name='phy'/>	22	<driver name='phy'/>
23	<source dev='/iscsi/winxp'/>	23	<source dev='/iscsi/winxp'/>
24	<target dev='hda' bus='ide'/>	24	<target dev='hda' bus='ide'/>
		25	<boot order='1'/>
25	</disk>	26	</disk>
26	<disk type='file' device='cdrom'>	27	<disk type='file' device='cdrom'>
27	<driver name='file'/>	28	<driver name='file'/>

Lines 18-23 Link Here

(-)a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml (+1 lines)
18	<driver name='phy'/>	18	<driver name='phy'/>
19	<source dev='/dev/vg_dom0test/test2vm'/>	19	<source dev='/dev/vg_dom0test/test2vm'/>
20	<target dev='xvda' bus='xen'/>	20	<target dev='xvda' bus='xen'/>
		21	<boot order='1'/>
21	</disk>	22	</disk>
22	<interface type='bridge'>	23	<interface type='bridge'>
23	<mac address='00:16:36:68:9f:5d'/>	24	<mac address='00:16:36:68:9f:5d'/>

Lines 2-5 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr (-1 / +1 lines)
2	(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\	2	(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
3	(on_reboot 'destroy')(on_crash 'destroy')(image (linux \	3	(on_reboot 'destroy')(on_crash 'destroy')(image (linux \
4	(kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')))\	4	(kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')))\
5	(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\	5	(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')(bootable 0))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w')))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0)))\
9	(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\	9	(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
10	(script 'vif-bridge')(ip '192.0.2.1'))))\	10	(script 'vif-bridge')(ip '192.0.2.1'))))\

Lines 1-6 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr (-1 / +1 lines)
1	(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\	1	(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\
2	(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\	2	(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\
3	(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\	3	(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
4	(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\	4	(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')(bootable 0)))\
5	(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\	5	(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\
6	(script 'vif-bridge'))))\	6	(script 'vif-bridge'))))\

Lines 3-7 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr (-1 / +1 lines)
3	(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\	3	(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
4	(image (linux (args 'ro root=/dev/VolGroup00/LogVol00')))\	4	(image (linux (args 'ro root=/dev/VolGroup00/LogVol00')))\
5	(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\	5	(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\
6	(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\	6	(mode 'w!')(bootable 0)))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\
7	(script 'vif-bridge'))))\	7	(script 'vif-bridge'))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\	8	(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\	8	(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\
8	(uname 'tap:qcow:/root/some.img')(mode 'w'))))\	8	(uname 'tap:qcow:/root/some.img')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\
8	(uname 'tap:aio:/root/some.img')(mode 'w'))))\	8	(uname 'tap:aio:/root/some.img')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\
8	(uname 'tap:aio:/root/some.img')(mode 'w'))))\	8	(uname 'tap:aio:/root/some.img')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (tap2 (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (tap2 (dev 'xvda')\
8	(uname 'tap2:aio:/root/some.img')(mode 'w'))))\	8	(uname 'tap2:aio:/root/some.img')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (tap2 (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (tap2 (dev 'xvda')\
8	(uname 'tap2:aio:/root/some.img')(mode 'w'))))\	8	(uname 'tap2:aio:/root/some.img')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w'))))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w'))))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0))))\

Lines 7-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-escape.sexpr (-1 / +1 lines)
7	core/test/5.91/x86_64/os&version="devel" ')\	7	core/test/5.91/x86_64/os&version="devel" ')\
8	(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\	8	(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\
9	(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))\	9	(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))\
10	(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w'))))\	10	(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w')(bootable 0))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
6	(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\	6	(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
6	(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\	6	(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 7-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr (-1 / +1 lines)
7	core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\	7	core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
8	(boot c)(usb 1)(parallel none)(serial pty)\	8	(boot c)(usb 1)(parallel none)(serial pty)\
9	(device_model '/usr/lib/xen/bin/qemu-dm')))\	9	(device_model '/usr/lib/xen/bin/qemu-dm')))\
10	(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))\	10	(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w')(bootable 0))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
6	(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 4-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
5	(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\	5	(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
6	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\	6	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
7	(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\	7	(mode 'w')(bootable 0)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
8	(script 'vif-bridge')(model 'e1000')(type ioemu))))\	8	(script 'vif-bridge')(model 'e1000')(type ioemu))))\

Lines 4-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
5	(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\	5	(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
6	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\	6	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
7	(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\	7	(mode 'w')(bootable 0)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
8	(script 'vif-bridge')(type netfront))))\	8	(script 'vif-bridge')(type netfront))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
6	(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 5-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr (-1 / +1 lines)
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
6	(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\	6	(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
7	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\	7	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
8	(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\	8	(mode 'w')(bootable 0)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
9	(script 'vif-bridge')(model 'e1000')(type ioemu))))\	9	(script 'vif-bridge')(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
6	(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 5-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr (-1 / +1 lines)
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
6	(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\	6	(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
7	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\	7	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
8	(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\	8	(mode 'w')(bootable 0)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
9	(script 'vif-bridge')(model 'e1000')(type ioemu))))\	9	(script 'vif-bridge')(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\
6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 5-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr (-1 / +1 lines)
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
6	(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\	6	(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
7	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\	7	(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
8	(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\	8	(mode 'w')(bootable 0)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
9	(script 'vif-bridge')(model 'e1000')(type ioemu))))\	9	(script 'vif-bridge')(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\
6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\
6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr (-1 / +1 lines)
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
6	(serial telnet:localhost:9999,server,nowait)\	6	(serial telnet:localhost:9999,server,nowait)\
7	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	7	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
8	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	8	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
10	(model 'e1000')(type ioemu))))\	10	(model 'e1000')(type ioemu))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr (-1 / +1 lines)
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
6	(serial tcp:localhost:9999,server,nowait)\	6	(serial tcp:localhost:9999,server,nowait)\
7	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	7	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
8	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	8	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
10	(model 'e1000')(type ioemu))))\	10	(model 'e1000')(type ioemu))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr (-1 / +1 lines)
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
6	(serial udp:localhost:9998@localhost:9999)\	6	(serial udp:localhost:9998@localhost:9999)\
7	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	7	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
8	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	8	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
10	(model 'e1000')(type ioemu))))\	10	(model 'e1000')(type ioemu))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr (-1 / +1 lines)
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
6	(serial unix:/tmp/serial.sock,server,nowait)\	6	(serial unix:/tmp/serial.sock,server,nowait)\
7	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	7	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
8	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	8	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
10	(model 'e1000')(type ioemu))))\	10	(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
6	(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(parallel none)\
6	(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)\
6	(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(type ioemu))))\	9	(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 4-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr (-2 / +2 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
5	(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\	5	(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
6	(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))\	6	(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))\
7	(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\	8	(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')(bootable 0)))\
9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
10	(model 'e1000')(type ioemu))))\	10	(model 'e1000')(type ioemu))))\

Lines 4-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr (-2 / +2 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
5	(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\	5	(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
6	(vnc 1)(vncunused 1)(keymap 'ja')))(device (vbd (dev 'hda:disk')\	6	(vnc 1)(vncunused 1)(keymap 'ja')))(device (vbd (dev 'hda:disk')\
7	(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')\	7	(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))(device (vbd (dev 'hdc:cdrom')\
8	(uname 'file:/root/boot.iso')(mode 'r')))\	8	(uname 'file:/root/boot.iso')(mode 'r')(bootable 0)))\
9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	9	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
10	(model 'e1000')(type ioemu))))\	10	(model 'e1000')(type ioemu))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-fv.sexpr (-1 / +1 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\	5	(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\	6	(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\	7	(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 0)))\
8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\	8	(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
9	(model 'e1000')(type ioemu))))\	9	(model 'e1000')(type ioemu))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w')))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0)))\
9	(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\	9	(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
10	(script 'vif-bridge'))))\	10	(script 'vif-bridge'))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w')))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0)))\
9	(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\	9	(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
10	(script 'vif-bridge')(model 'e1000'))))\	10	(script 'vif-bridge')(model 'e1000'))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w')))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0)))\
9	(device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')\	9	(device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')\
10	(ip '172.14.5.6'))))\	10	(ip '172.14.5.6'))))\

Lines 4-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr (-2 / +2 lines)
4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\	4	(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
5	(apic 1)(pae 1)(usb 1)(parallel none)(serial none)\	5	(apic 1)(pae 1)(usb 1)(parallel none)(serial none)\
6	(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)))\	6	(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)))\
7	(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))\	7	(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')(bootable 0)))\
8	(device (vbd (dev 'hdc:cdrom')(mode 'r')))\	8	(device (vbd (dev 'hdc:cdrom')(mode 'r')(bootable 0)))\
9	(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu))))\	9	(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))\	8	(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')(bootable 0)))\
9	(device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))\	9	(device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))\
10	(dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\	10	(dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\

Lines 2-5 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr (-1 / +1 lines)
2	(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\	2	(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\
3	(bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\	3	(bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\
4	(on_crash 'destroy')(image (linux (args 'xenfb.video=8,1280,1024')))\	4	(on_crash 'destroy')(image (linux (args 'xenfb.video=8,1280,1024')))\
5	(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\	5	(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')(bootable 0))))\

Lines 2-5 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr (-1 / +1 lines)
2	(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\	2	(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\
3	(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\	3	(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\
4	(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')\	4	(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')\
5	(uname 'file:/root/some.img')(mode 'w'))))\	5	(uname 'file:/root/some.img')(mode 'w')(bootable 0))))\

Lines 1-6 Link Here

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

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w'))))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0)))(device (vkbd))\
9	(device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')\	9	(device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')\
10	(vncpasswd '123456')(keymap 'ja'))))\	10	(vncpasswd '123456')(keymap 'ja'))))\

Lines 5-10 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr (-1 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0)))(device (vkbd))\
9	(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\	9	(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\
10	(vncpasswd '123456')(keymap 'ja'))))\	10	(vncpasswd '123456')(keymap 'ja'))))\

Lines 6-9 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr (-1 / +1 lines)
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')(vnc 1)(vncunused 0)(vncdisplay 6)\	7	core/test/5.91/x86_64/os ')(vnc 1)(vncunused 0)(vncdisplay 6)\
8	(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))\	8	(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))\
9	(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\	9	(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')(bootable 0))))\

Lines 5-8 Link Here

(-)a/tests/xml2sexprdata/xml2sexpr-pv.sexpr (-2 / +1 lines)
5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\	5	(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\	6	(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\	7	core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
8	(uname 'file:/root/some.img')(mode 'w'))))\	8	(uname 'file:/root/some.img')(mode 'w')(bootable 0))))\
9	-

Return to bug 24266

Lines 335-340 xenParseSxprDisks(virDomainDefPtr def, Link Here

(-)a/src/xenxs/xen_sxpr.c (-7 / +11 lines)
335	{	335	{
336	const struct sexpr cur, node;	336	const struct sexpr cur, node;
337	virDomainDiskDefPtr disk = NULL;	337	virDomainDiskDefPtr disk = NULL;
		338	int bootIndex = 0;
338		339
339	for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {	340	for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
340	node = cur->u.s.car;	341	node = cur->u.s.car;
Lines 494-509 xenParseSxprDisks(virDomainDefPtr def, Link Here
494	strchr(mode, '!'))	495	strchr(mode, '!'))
495	disk->shared = 1;	496	disk->shared = 1;
496		497
		498	if (STREQ_NULLABLE(bootable, "1"))
		499	disk->bootIndex = ++bootIndex;
		500
497	if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)	501	if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
498	goto no_memory;	502	goto no_memory;
499		503
500	/* re-order disks if there is a bootable device */	504	def->disks[def->ndisks++] = disk;
501	if (STREQ_NULLABLE(bootable, "1")) {
502	def->disks[def->ndisks++] = def->disks[0];
503	def->disks[0] = disk;
504	} else {
505	def->disks[def->ndisks++] = disk;
506	}
507	disk = NULL;	505	disk = NULL;
508	}	506	}
509	}	507	}
Lines 1736-1741 xenFormatSxprDisk(virDomainDiskDefPtr def, Link Here
1736	virBufferAddLit(buf, "(mode 'w!')");	1734	virBufferAddLit(buf, "(mode 'w!')");
1737	else	1735	else
1738	virBufferAddLit(buf, "(mode 'w')");	1736	virBufferAddLit(buf, "(mode 'w')");
		1737
		1738	if (def->bootIndex)
		1739	virBufferAddLit(buf, "(bootable 1)");
		1740	else
		1741	virBufferAddLit(buf, "(bootable 0)");
		1742
1739	if (def->transient) {	1743	if (def->transient) {
1740	XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,	1744	XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
1741	_("transient disks not supported yet"));	1745	_("transient disks not supported yet"));