Run bootloader at domain creation
PATCH 1/1 Run bootloader at domain creation
Instead of relying on xm create to always run the bootloader, make sure we run it if we get into domain creation with a bootloader set but no image. This could happen if someone creates a domain config via the XML-RPC or sxp interfaces.
# HG changeset patch
# User "Jeremy Katz <[email protected]>"
# Node ID 732f89a0a4a8732f4ffb1a59022be0a58cce49cf
# Parent 3d91ee7c86ec9316d7552218e21ab0d921a93a1e
run the bootloader if we get to domain construction and don't have an image set up, eg, for cases where we don't go through xm create
tools/python/xen/xend/XendDomainInfo.py +14 -7
@@ -1234,6 +1234,11 @@ class XendDomainInfo: self.domid, self.info['cpu_weight']) + # if we have a boot loader but no image, then we need to set things + # up by running the boot loader non-interactively + if self.infoIsSet('bootloader') and not self.infoIsSet('image'): + self.configure_bootloader() + if not self.infoIsSet('image'): raise VmError('Missing image in configuration')
@@ -1613,23 +1618,25 @@ class XendDomainInfo: def configure_bootloader(self): + """Run the bootloader if we're configured to do so.""" if not self.info['bootloader']: return - # if we're restarting with a bootloader, we need to run it blcfg = None - config = self.sxpr() - # FIXME: this assumes that we want to use the first disk - for dev in sxp.children(config, "device"): - disk = sxp.child(dev, "vbd") + # FIXME: this assumes that we want to use the first disk device + for (n,c) in self.info['device']: + if not n or not c or n != "vbd": + continue + disk = sxp.child_value(c, "uname") if disk is None: continue - fn = blkdev_uname_to_file(sxp.child_value(disk, "uname")) + fn = blkdev_uname_to_file(disk) blcfg = bootloader(self.info['bootloader'], fn, 1) + break if blcfg is None: msg = "Had a bootloader specified, but can't find disk" log.error(msg) raise VmError(msg) - self.info['image'] = sxp.to_string(blcfg) + self.info['image'] = blcfg def send_sysrq(self, key):
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 4 lines · Jeremy Katz
Instead of relying on xm create to always run the bootloader, make sure we run it if we get into domain creation with a bootloader set but no image. This could happen if someone creates a domain config via the XML-RPC or sxp interfaces.
This is crucial for libvirt correct operations when creating domains.
I hope this goes in, this is a blocker for me.
Daniel
Signature · 3 lines
Daniel Veillard | Red Hat http://redhat.com/ [email protected] | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/