Attachment #3719 for bug #24266




          <empty/>
        </element>
      </optional>
      <optional>
        <element name='deviceboot'>
          <empty/>
        </element>
      </optional>
    </element>
  </define>

- 
--
src/xen/xend_internal.c |    4 ++--
src/xenxs/xen_sxpr.c    |   13 +++++++++++--
src/xenxs/xen_sxpr.h    |    2 +-
3 files changed, 14 insertions(+), 5 deletions(-)

(-)a/src/xen/xend_internal.c (-2 / +2 lines)

Lines 2690-2696 xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml,	Link Here

2690

        if (xenFormatSxprDisk(dev->data.disk,

2690

        if (xenFormatSxprDisk(dev->data.disk,

2691

                              &buf,

2691

                              &buf,

2692

                              STREQ(def->os.type, "hvm") ? 1 : 0,

2692

                              STREQ(def->os.type, "hvm") ? 1 : 0,

2693

                              priv->xendConfigVersion, 1) < 0)

2693

                              priv->xendConfigVersion, 1, -1) < 0)

2694

            goto cleanup;

2694

            goto cleanup;

2695

2696

        if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) {

2696

        if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) {

Lines 2858-2864 xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml,	Link Here

2858

        if (xenFormatSxprDisk(dev->data.disk,

2858

        if (xenFormatSxprDisk(dev->data.disk,

2859

                              &buf,

2859

                              &buf,

2860

                              STREQ(def->os.type, "hvm") ? 1 : 0,

2860

                              STREQ(def->os.type, "hvm") ? 1 : 0,

2861

                              priv->xendConfigVersion, 1) < 0)

2861

                              priv->xendConfigVersion, 1, -1) < 0)

2862

            goto cleanup;

2862

            goto cleanup;

2863

        break;

2863

        break;

2864

(-)a/src/xenxs/xen_sxpr.c (-2 / +11 lines)

Lines 1629-1634 xenFormatSxprChr(virDomainChrDefPtr def,	Link Here

1629

 * @node: node containing disk description

1629

 * @node: node containing disk description

1630

 * @buf: a buffer for the result S-Expr

1630

 * @buf: a buffer for the result S-Expr

1631

 * @xendConfigVersion: xend configuration file format

1631

 * @xendConfigVersion: xend configuration file format

1632

 * @isAttach: generate format for online device update

1633

 * @isBootable: >0 set, 0 remove, -1 don't touch  bootable flag

1632

1634

1633

 * Parse the one disk in the XML description and add it to the S-Expr in buf

1635

 * Parse the one disk in the XML description and add it to the S-Expr in buf

1634

 * This is a temporary interface as the S-Expr interface

1636

 * This is a temporary interface as the S-Expr interface

Lines 1642-1648 xenFormatSxprDisk(virDomainDiskDefPtr def,	Link Here

1642

                  virBufferPtr buf,

1644

                  virBufferPtr buf,

1643

                  int hvm,

1645

                  int hvm,

1644

                  int xendConfigVersion,

1646

                  int xendConfigVersion,

1645

                  int isAttach)

1647

                  int isAttach,

1648

                  int isBootable)

1646

1649

1647

    /* Xend (all versions) put the floppy device config

1650

    /* Xend (all versions) put the floppy device config

1648

     * under the hvm (image (os)) block

1651

     * under the hvm (image (os)) block

Lines 1736-1741 xenFormatSxprDisk(virDomainDiskDefPtr def,	Link Here

1736

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

1739

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

1737

    else

1740

    else

1738

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

1741

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

1742

1743

    if (isBootable > 0)

1744

        virBufferAddLit(buf, "(bootable 1)");

1745

    else if (isBootable == 0)

1746

        virBufferAddLit(buf, "(bootable 0)");

1747

1739

    if (def->transient) {

1748

    if (def->transient) {

1740

        XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,

1749

        XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,

1741

                    _("transient disks not supported yet"));

1750

                    _("transient disks not supported yet"));

Lines 2308-2314 xenFormatSxpr(virConnectPtr conn,	Link Here

2308

2317

2309

    for (i = 0 ; i < def->ndisks ; i++)

2318

    for (i = 0 ; i < def->ndisks ; i++)

2310

        if (xenFormatSxprDisk(def->disks[i],

2319

        if (xenFormatSxprDisk(def->disks[i],

2311

                              &buf, hvm, xendConfigVersion, 0) < 0)

2320

                              &buf, hvm, xendConfigVersion, 0, -1) < 0)

2312

            goto error;

2321

            goto error;

2313

2322

2314

    for (i = 0 ; i < def->nnets ; i++)

2323

    for (i = 0 ; i < def->nnets ; i++)




virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty);

int xenFormatSxprDisk(virDomainDiskDefPtr def, virBufferPtr buf, int hvm,
                      int xendConfigVersion, int isAttach, int isBootable);

int xenFormatSxprNet(virConnectPtr conn,
                     virDomainNetDefPtr def, virBufferPtr buf, int hvm,
- 
--
--
src/xen/xen_hypervisor.c |    7 +++++++
src/xenxs/xen_sxpr.c     |   39 ++++++++++++++++++++++++++++++---------
2 files changed, 37 insertions(+), 9 deletions(-)

(-)a/src/xen/xen_hypervisor.c (+7 lines)

Lines 2402-2407 xenHypervisorBuildCapabilities(virConnectPtr conn,	Link Here

2402

0,

2402

0,

2403

                                                   1) == NULL)

2403

                                                   1) == NULL)

2404

                    goto no_memory;

2404

                    goto no_memory;

2405

        } else { /* !hvm */

2406

            /* Limited suport of deviceboot Xen-PV domains using PyGrub */

2407

            if (virCapabilitiesAddGuestFeature(guest,

2408

                                               "deviceboot",

2409

1,

2410

                                               0) == NULL)

2411

                    goto no_memory;

2405

2412

2406

2413

2407

2414




{
    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;
        }
    }

    const char *tmp;
    char *bufout;
    int hvm = 0, i;
    virDomainDiskDefPtr *disks = NULL;

    VIR_DEBUG("Formatting domain sexpr");


        }
    }

    /* Sort bootable disks in ascending order by bootIndex, other disks behind */
    if (VIR_ALLOC_N(disks, def->ndisks) < 0)
        goto error;
    for (i = 0; i < def->ndisks; i++) {
        if (def->disks[i]->bootIndex) {
            int j;
            /* move back later disks */
            for (j = i;
                 j > 0 && (disks[j - 1]->bootIndex == 0 ||
                           disks[j - 1]->bootIndex > def->disks[i]->bootIndex);
                 j--)
                disks[j] = disks[j - 1];
            disks[j] = def->disks[i];
        } else {
            /* append disks without explicit bootIndex to tail */
            disks[i] = def->disks[i];
        }
    }

    for (i = 0 ; i < def->ndisks ; i++)
        if (xenFormatSxprDisk(disks[i],
                              &buf, hvm, xendConfigVersion, 0,
                              i == 0 || disks[i]->bootIndex > 0) < 0)
            goto error;
    VIR_FREE(disks);

    for (i = 0 ; i < def->nnets ; i++)
        if (xenFormatSxprNet(conn, def->nets[i],

    return bufout;

error:
    VIR_FREE(disks);
    virBufferFreeAndReset(&buf);
    return NULL;
}
- 
--
--
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml      |    1 +
.../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml  |    1 +
tests/xencapsdata/xen-i686-pae-hvm.xml             |    1 +
tests/xencapsdata/xen-i686-pae.xml                 |    1 +
tests/xencapsdata/xen-i686.xml                     |    1 +
tests/xencapsdata/xen-ia64-be-hvm.xml              |    1 +
tests/xencapsdata/xen-ia64-be.xml                  |    1 +
tests/xencapsdata/xen-ia64-hvm.xml                 |    3 +++
tests/xencapsdata/xen-ia64.xml                     |    3 +++
tests/xencapsdata/xen-ppc64.xml                    |    3 +++
tests/xencapsdata/xen-x86_64-hvm.xml               |    3 +++
tests/xencapsdata/xen-x86_64.xml                   |    3 +++
tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr      |    2 +-
tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr  |    2 +-
tests/xml2sexprdata/xml2sexpr-curmem.sexpr         |    2 +-
.../xml2sexpr-disk-block-shareable.sexpr           |    2 +-
tests/xml2sexprdata/xml2sexpr-disk-block.sexpr     |    2 +-
.../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr |    2 +-
.../xml2sexpr-disk-drv-blktap-qcow.sexpr           |    2 +-
.../xml2sexpr-disk-drv-blktap-raw.sexpr            |    2 +-
.../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr  |    2 +-
.../xml2sexpr-disk-drv-blktap2-raw.sexpr           |    2 +-
.../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr |    2 +-
tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr  |    2 +-
tests/xml2sexprdata/xml2sexpr-disk-file.sexpr      |    2 +-
tests/xml2sexprdata/xml2sexpr-escape.sexpr         |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr  |    2 +-
.../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr  |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr      |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr   |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr   |    2 +-
.../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr  |    2 +-
.../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr  |    2 +-
.../xml2sexpr-fv-serial-dev-2-ports.sexpr          |    2 +-
.../xml2sexpr-fv-serial-dev-2nd-port.sexpr         |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr  |    2 +-
.../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr  |    2 +-
.../xml2sexpr-fv-serial-tcp-telnet.sexpr           |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr  |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr  |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr       |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr    |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr   |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr         |    2 +-
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr          |    4 ++--
tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr   |    4 ++--
tests/xml2sexprdata/xml2sexpr-fv.sexpr             |    2 +-
tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr    |    2 +-
tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr      |    2 +-
tests/xml2sexprdata/xml2sexpr-net-routed.sexpr     |    2 +-
.../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr  |    4 ++--
tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr       |    2 +-
.../xml2sexpr-pv-bootloader-cmdline.sexpr          |    2 +-
tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr  |    2 +-
tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr   |    2 +-
tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr       |    2 +-
.../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr  |    2 +-
tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr     |    2 +-
tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr    |    2 +-
tests/xml2sexprdata/xml2sexpr-pv.sexpr             |    2 +-
64 files changed, 77 insertions(+), 55 deletions(-)

(-)a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml (+1 lines)

Lines 22-27	Link Here

      <driver name='phy'/>

      <driver name='phy'/>

      <source dev='/iscsi/winxp'/>

      <source dev='/iscsi/winxp'/>

      <target dev='hda' bus='ide'/>

      <target dev='hda' bus='ide'/>

      <boot order='1'/>

    </disk>

    </disk>

    <disk type='file' device='cdrom'>

    <disk type='file' device='cdrom'>

      <driver name='file'/>

      <driver name='file'/>

(-)a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml (+1 lines)

Lines 18-23	Link Here

      <driver name='phy'/>

      <driver name='phy'/>

      <source dev='/dev/vg_dom0test/test2vm'/>

      <source dev='/dev/vg_dom0test/test2vm'/>

      <target dev='xvda' bus='xen'/>

      <target dev='xvda' bus='xen'/>

      <boot order='1'/>

    </disk>

    </disk>

    <interface type='bridge'>

    <interface type='bridge'>

      <mac address='00:16:36:68:9f:5d'/>

      <mac address='00:16:36:68:9f:5d'/>

(-)a/tests/xencapsdata/xen-i686-pae-hvm.xml (+1 lines)

Lines 26-31	Link Here

    </arch>

    </arch>

    <features>

    <features>

      <pae/>

      <pae/>

      <deviceboot/>

    </features>

    </features>

  </guest>

  </guest>

(-)a/tests/xencapsdata/xen-i686-pae.xml (+1 lines)

Lines 26-31	Link Here

    </arch>

    </arch>

    <features>

    <features>

      <pae/>

      <pae/>

      <deviceboot/>

    </features>

    </features>

  </guest>

  </guest>

(-)a/tests/xencapsdata/xen-i686.xml (+1 lines)

Lines 23-28	Link Here

    </arch>

    </arch>

    <features>

    <features>

      <nonpae/>

      <nonpae/>

      <deviceboot/>

    </features>

    </features>

  </guest>

  </guest>

(-)a/tests/xencapsdata/xen-ia64-be-hvm.xml (+1 lines)

Lines 23-28	Link Here

    </arch>

    </arch>

    <features>

    <features>

      <ia64_be/>

      <ia64_be/>

      <deviceboot/>

    </features>

    </features>

  </guest>

  </guest>

(-)a/tests/xencapsdata/xen-ia64-be.xml (+1 lines)

Lines 23-28	Link Here

    </arch>

    </arch>

    <features>

    <features>

      <ia64_be/>

      <ia64_be/>

      <deviceboot/>

    </features>

    </features>

  </guest>

  </guest>

(-)a/tests/xencapsdata/xen-ia64-hvm.xml (+3 lines)

Lines 21-26	Link Here

      <domain type='xen'>

      <domain type='xen'>

      </domain>

      </domain>

    </arch>

    </arch>

    <features>

      <deviceboot/>

    </features>

  </guest>

  </guest>

  <guest>

  <guest>

(-)a/tests/xencapsdata/xen-ia64.xml (+3 lines)

Lines 21-26	Link Here

      <domain type='xen'>

      <domain type='xen'>

      </domain>

      </domain>

    </arch>

    </arch>

    <features>

      <deviceboot/>

    </features>

  </guest>

  </guest>

</capabilities>

</capabilities>

(-)a/tests/xencapsdata/xen-ppc64.xml (+3 lines)

Lines 21-26	Link Here

      <domain type='xen'>

      <domain type='xen'>

      </domain>

      </domain>

    </arch>

    </arch>

    <features>

      <deviceboot/>

    </features>

  </guest>

  </guest>

</capabilities>

</capabilities>

(-)a/tests/xencapsdata/xen-x86_64-hvm.xml (+3 lines)

Lines 24-29	Link Here

      <domain type='xen'>

      <domain type='xen'>

      </domain>

      </domain>

    </arch>

    </arch>

    <features>

      <deviceboot/>

    </features>

  </guest>

  </guest>

  <guest>

  <guest>

(-)a/tests/xencapsdata/xen-x86_64.xml (+3 lines)

Lines 24-29	Link Here

      <domain type='xen'>

      <domain type='xen'>

      </domain>

      </domain>

    </arch>

    </arch>

    <features>

      <deviceboot/>

    </features>

  </guest>

  </guest>

</capabilities>

</capabilities>

(-)a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr (-1 / +1 lines)

Lines 2-5	Link Here

(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')))\

(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\

(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w')))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1)))\

(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')(ip '192.0.2.1'))))\

(script 'vif-bridge')(ip '192.0.2.1'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr (-1 / +1 lines)

Lines 1-6	Link Here

(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')\

(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\

(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')(bootable 1)))\

(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'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr (-1 / +1 lines)

Lines 3-7	Link Here

(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')))\

(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!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\

(mode 'w!')(bootable 1)))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\

(script 'vif-bridge'))))\

(script 'vif-bridge'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\

(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\

(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (tap (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')\

(uname 'tap:qcow:/root/some.img')(mode 'w'))))\

(uname 'tap:qcow:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (tap (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')\

(uname 'tap:aio:/root/some.img')(mode 'w'))))\

(uname 'tap:aio:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (tap (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')\

(uname 'tap:aio:/root/some.img')(mode 'w'))))\

(uname 'tap:aio:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (tap2 (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (tap2 (dev 'xvda')\

(uname 'tap2:aio:/root/some.img')(mode 'w'))))\

(uname 'tap2:aio:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (tap2 (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (tap2 (dev 'xvda')\

(uname 'tap2:aio:/root/some.img')(mode 'w'))))\

(uname 'tap2:aio:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w'))))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w'))))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-escape.sexpr (-1 / +1 lines)

Lines 7-10	Link Here

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')))\

(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w'))))\

(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr (-1 / +1 lines)

Lines 7-10	Link Here

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')))\

(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))\

(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\

(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\

(localtime 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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr (-1 / +1 lines)

Lines 4-8	Link Here

(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)))(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')(bootable 1)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\

(script 'vif-bridge')(model 'e1000')(type ioemu))))\

(script 'vif-bridge')(model 'e1000')(type ioemu))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr (-1 / +1 lines)

Lines 4-8	Link Here

(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)))(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')(bootable 1)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\

(script 'vif-bridge')(type netfront))))\

(script 'vif-bridge')(type netfront))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr (-1 / +1 lines)

Lines 5-9	Link Here

(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')(bootable 1)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\

(script 'vif-bridge')(model 'e1000')(type ioemu))))\

(script 'vif-bridge')(model 'e1000')(type ioemu))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr (-1 / +1 lines)

Lines 5-9	Link Here

(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\

(cdrom '/root/boot.iso')(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')(bootable 1)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\

(script 'vif-bridge')(model 'e1000')(type ioemu))))\

(script 'vif-bridge')(model 'e1000')(type ioemu))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr (-1 / +1 lines)

Lines 5-9	Link Here

(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\

(cdrom '/root/boot.iso')(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')(bootable 1)))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\

(script 'vif-bridge')(model 'e1000')(type ioemu))))\

(script 'vif-bridge')(model 'e1000')(type ioemu))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\

(cdrom '/root/boot.iso')(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')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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)))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)(usbdevice mouse)(parallel none)\

(cdrom '/root/boot.iso')(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)))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)(usbdevice tablet)(parallel none)\

(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(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)))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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)))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr (-2 / +2 lines)

Lines 4-10	Link Here

(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')))\

(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\

(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))\

(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\

(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')(bootable 0)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr (-2 / +2 lines)

Lines 4-10	Link Here

(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')))(device (vbd (dev 'hda:disk')\

(vnc 1)(vncunused 1)(keymap 'ja')))(device (vbd (dev 'hda:disk')\

(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')\

(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))(device (vbd (dev 'hdc:cdrom')\

(uname 'file:/root/boot.iso')(mode 'r')))\

(uname 'file:/root/boot.iso')(mode 'r')(bootable 0)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-fv.sexpr (-1 / +1 lines)

Lines 4-9	Link Here

(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)\

(cdrom '/root/boot.iso')(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)))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\

(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))\

(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))))\

(-)a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w')))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1)))\

(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'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w')))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1)))\

(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'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w')))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1)))\

(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'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr (-2 / +2 lines)

Lines 4-9	Link Here

(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)))\

(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))\

(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')(bootable 1)))\

(device (vbd (dev 'hdc:cdrom')(mode 'r')))\

(device (vbd (dev 'hdc:cdrom')(mode 'r')(bootable 0)))\

(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu))))\

(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))\

(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')(bootable 1)))\

(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)))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr (-1 / +1 lines)

Lines 2-5	Link Here

(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')))\

(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\

(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr (-1 / +1 lines)

Lines 2-5	Link Here

(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')(device (vbd (dev 'xvda')\

(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w'))))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr (-1 / +1 lines)

Lines 1-6	Link Here

(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')(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')(bootable 1)))\

(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'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr (-1 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w'))))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1)))(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'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr (-1 / +1 lines)

Lines 5-10	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1)))(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'))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr (-1 / +1 lines)

Lines 6-9	Link Here

(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  ')(vnc 1)(vncunused 0)(vncdisplay 6)\

core/test/5.91/x86_64/os  ')(vnc 1)(vncunused 0)(vncdisplay 6)\

(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))\

(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))\

(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\

(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')(bootable 1))))\

(-)a/tests/xml2sexprdata/xml2sexpr-pv.sexpr (-2 / +1 lines)

Lines 5-8	Link Here

(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  ')))(device (vbd (dev 'xvda')\

core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\

(uname 'file:/root/some.img')(mode 'w'))))\

(uname 'file:/root/some.img')(mode 'w')(bootable 1))))\

Return to bug 24266