Fix HVM booting through Xen-API when the kernel is unspecified.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

tools/python/xen/xend/XendDomainInfo.py

@@ -1555,6 +1555,8 @@ class XendDomainInfo:
         if boot:
             # HVM booting.
             self.info['image']['type'] = 'hvm'
+            if not 'devices' in self.info['image']:
+                self.info['image']['devices'] = {}
             self.info['image']['devices']['boot'] = boot
         elif not blexec and kernel:
             # Boot from dom0.  Nothing left to do -- the kernel and ramdisk

tools/python/xen/xend/image.py

@@ -312,6 +312,9 @@ class HVMImageHandler(ImageHandler):
     def configure(self, vmConfig, imageConfig, deviceConfig):
         ImageHandler.configure(self, vmConfig, imageConfig, deviceConfig)
 
+        if not self.kernel:
+            self.kernel = '/usr/lib/xen/boot/hvmloader'
+
         info = xc.xeninfo()
         if 'hvm' not in info['xen_caps']:
             raise VmError("HVM guest support is unavailable: is VT/AMD-V "