@@ -, +, @@ doc: Add capability. xen: support bootable flag for Xen-PV. xen: fix PyGrub device order using boot/@order test/xen: PyGrub device order using boot/@order docs/schemas/capability.rng | 5 ++ src/xen/xen_hypervisor.c | 7 +++ src/xen/xend_internal.c | 4 +- src/xenxs/xen_sxpr.c | 50 ++++++++++++++++---- src/xenxs/xen_sxpr.h | 2 +- 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 +- 69 files changed, 132 insertions(+), 68 deletions(-) --- docs/schemas/capability.rng | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) --- a/docs/schemas/capability.rng +++ a/docs/schemas/capability.rng @@ -302,6 +302,11 @@ + + + + + -- --- 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 +++ a/src/xen/xend_internal.c @@ -2690,7 +2690,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, if (xenFormatSxprDisk(dev->data.disk, &buf, STREQ(def->os.type, "hvm") ? 1 : 0, - priv->xendConfigVersion, 1) < 0) + priv->xendConfigVersion, 1, -1) < 0) goto cleanup; if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { @@ -2858,7 +2858,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, if (xenFormatSxprDisk(dev->data.disk, &buf, STREQ(def->os.type, "hvm") ? 1 : 0, - priv->xendConfigVersion, 1) < 0) + priv->xendConfigVersion, 1, -1) < 0) goto cleanup; break; --- a/src/xenxs/xen_sxpr.c +++ a/src/xenxs/xen_sxpr.c @@ -1629,6 +1629,8 @@ xenFormatSxprChr(virDomainChrDefPtr def, * @node: node containing disk description * @buf: a buffer for the result S-Expr * @xendConfigVersion: xend configuration file format + * @isAttach: generate format for online device update + * @isBootable: >0 set, 0 remove, -1 don't touch bootable flag * * Parse the one disk in the XML description and add it to the S-Expr in buf * This is a temporary interface as the S-Expr interface @@ -1642,7 +1644,8 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, virBufferPtr buf, int hvm, int xendConfigVersion, - int isAttach) + int isAttach, + int isBootable) { /* Xend (all versions) put the floppy device config * under the hvm (image (os)) block @@ -1736,6 +1739,12 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, virBufferAddLit(buf, "(mode 'w!')"); else virBufferAddLit(buf, "(mode 'w')"); + + if (isBootable > 0) + virBufferAddLit(buf, "(bootable 1)"); + else if (isBootable == 0) + virBufferAddLit(buf, "(bootable 0)"); + if (def->transient) { XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, _("transient disks not supported yet")); @@ -2308,7 +2317,7 @@ xenFormatSxpr(virConnectPtr conn, for (i = 0 ; i < def->ndisks ; i++) if (xenFormatSxprDisk(def->disks[i], - &buf, hvm, xendConfigVersion, 0) < 0) + &buf, hvm, xendConfigVersion, 0, -1) < 0) goto error; for (i = 0 ; i < def->nnets ; i++) --- a/src/xenxs/xen_sxpr.h +++ a/src/xenxs/xen_sxpr.h @@ -47,7 +47,7 @@ int xenParseSxprSound(virDomainDefPtr def, const char *str); virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty); int xenFormatSxprDisk(virDomainDiskDefPtr def, virBufferPtr buf, int hvm, - int xendConfigVersion, int isAttach); + 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 +++ a/src/xen/xen_hypervisor.c @@ -2402,6 +2402,13 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, 0, 1) == NULL) goto no_memory; + } else { /* !hvm */ + /* Limited suport of deviceboot Xen-PV domains using PyGrub */ + if (virCapabilitiesAddGuestFeature(guest, + "deviceboot", + 1, + 0) == NULL) + goto no_memory; } } --- a/src/xenxs/xen_sxpr.c +++ a/src/xenxs/xen_sxpr.c @@ -335,6 +335,7 @@ xenParseSxprDisks(virDomainDefPtr def, { 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; @@ -494,16 +495,13 @@ xenParseSxprDisks(virDomainDefPtr def, 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; - /* re-order disks if there is a bootable device */ - if (STREQ_NULLABLE(bootable, "1")) { - def->disks[def->ndisks++] = def->disks[0]; - def->disks[0] = disk; - } else { - def->disks[def->ndisks++] = disk; - } + def->disks[def->ndisks++] = disk; disk = NULL; } } @@ -2043,6 +2041,7 @@ xenFormatSxpr(virConnectPtr conn, const char *tmp; char *bufout; int hvm = 0, i; + virDomainDiskDefPtr *disks = NULL; VIR_DEBUG("Formatting domain sexpr"); @@ -2315,10 +2314,31 @@ xenFormatSxpr(virConnectPtr conn, } } + /* 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(def->disks[i], - &buf, hvm, xendConfigVersion, 0, -1) < 0) + 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], @@ -2349,6 +2369,7 @@ xenFormatSxpr(virConnectPtr conn, 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 +++ a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml @@ -22,6 +22,7 @@ + --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +++ a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml @@ -18,6 +18,7 @@ + --- a/tests/xencapsdata/xen-i686-pae-hvm.xml +++ a/tests/xencapsdata/xen-i686-pae-hvm.xml @@ -26,6 +26,7 @@ + --- a/tests/xencapsdata/xen-i686-pae.xml +++ a/tests/xencapsdata/xen-i686-pae.xml @@ -26,6 +26,7 @@ + --- a/tests/xencapsdata/xen-i686.xml +++ a/tests/xencapsdata/xen-i686.xml @@ -23,6 +23,7 @@ + --- a/tests/xencapsdata/xen-ia64-be-hvm.xml +++ a/tests/xencapsdata/xen-ia64-be-hvm.xml @@ -23,6 +23,7 @@ + --- a/tests/xencapsdata/xen-ia64-be.xml +++ a/tests/xencapsdata/xen-ia64-be.xml @@ -23,6 +23,7 @@ + --- a/tests/xencapsdata/xen-ia64-hvm.xml +++ a/tests/xencapsdata/xen-ia64-hvm.xml @@ -21,6 +21,9 @@ + + + --- a/tests/xencapsdata/xen-ia64.xml +++ a/tests/xencapsdata/xen-ia64.xml @@ -21,6 +21,9 @@ + + + --- a/tests/xencapsdata/xen-ppc64.xml +++ a/tests/xencapsdata/xen-ppc64.xml @@ -21,6 +21,9 @@ + + + --- a/tests/xencapsdata/xen-x86_64-hvm.xml +++ a/tests/xencapsdata/xen-x86_64-hvm.xml @@ -24,6 +24,9 @@ + + + --- a/tests/xencapsdata/xen-x86_64.xml +++ a/tests/xencapsdata/xen-x86_64.xml @@ -24,6 +24,9 @@ + + + --- a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr @@ -2,4 +2,4 @@ (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ (on_reboot 'destroy')(on_crash 'destroy')(image (linux \ (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 +++ a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr @@ -5,6 +5,6 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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')\ (script 'vif-bridge')(ip '192.0.2.1'))))\ --- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr @@ -1,6 +1,6 @@ (vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\ (uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\ (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')\ (script 'vif-bridge'))))\ --- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr @@ -3,5 +3,5 @@ (on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\ (image (linux (args 'ro root=/dev/VolGroup00/LogVol00')))\ (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'))))\ --- a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-escape.sexpr @@ -7,4 +7,4 @@ core/test/5.91/x86_64/os&version="devel" ')\ (loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\ (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 +++ a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (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 (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (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 (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr @@ -7,4 +7,4 @@ core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\ (boot c)(usb 1)(parallel none)(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-localtime.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr @@ -4,5 +4,5 @@ (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')\ (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))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr @@ -4,5 +4,5 @@ (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')\ (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))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr @@ -5,5 +5,5 @@ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (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')\ -(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))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr @@ -5,5 +5,5 @@ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (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')\ -(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))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr @@ -5,5 +5,5 @@ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (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')\ -(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))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr @@ -5,6 +5,6 @@ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (serial telnet:localhost:9999,server,nowait)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr @@ -5,6 +5,6 @@ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (serial tcp:localhost:9999,server,nowait)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr @@ -5,6 +5,6 @@ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (serial udp:localhost:9998@localhost:9999)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr @@ -5,6 +5,6 @@ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ (serial unix:/tmp/serial.sock,server,nowait)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (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)))\ -(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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(parallel none)\ (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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)\ (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')\ (type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(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')(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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr @@ -4,7 +4,7 @@ (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')\ (vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))\ -(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\ -(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ +(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))\ +(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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr @@ -4,7 +4,7 @@ (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')\ (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/boot.iso')(mode 'r')))\ +(uname 'file:/root/foo.img')(mode 'w')(bootable 1)))(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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-fv.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-fv.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(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')(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')\ (model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr @@ -5,6 +5,6 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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')\ (script 'vif-bridge'))))\ --- a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr @@ -5,6 +5,6 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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')\ (script 'vif-bridge')(model 'e1000'))))\ --- a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr @@ -5,6 +5,6 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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')\ (ip '172.14.5.6'))))\ --- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr @@ -4,6 +4,6 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ (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 (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))\ -(device (vbd (dev 'hdc:cdrom')(mode 'r')))\ +(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')(bootable 1)))\ +(device (vbd (dev 'hdc:cdrom')(mode 'r')(bootable 0)))\ (device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu))))\ --- a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr @@ -5,6 +5,6 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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))\ (dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\ --- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr @@ -2,4 +2,4 @@ (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\ (bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\ (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 +++ a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr @@ -2,4 +2,4 @@ (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\ (bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\ (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 +++ a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr @@ -1,6 +1,6 @@ (vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\ (uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\ (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')\ (script 'vif-bridge'))))\ --- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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 +++ a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr @@ -5,6 +5,6 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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')\ (vncpasswd '123456')(keymap 'ja'))))\ --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr @@ -5,6 +5,6 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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')\ (vncpasswd '123456')(keymap 'ja'))))\ --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr +++ a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr @@ -6,4 +6,4 @@ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ core/test/5.91/x86_64/os ')(vnc 1)(vncunused 0)(vncdisplay 6)\ (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 +++ a/tests/xml2sexprdata/xml2sexpr-pv.sexpr @@ -5,4 +5,4 @@ (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ 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))))\ --