1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Wed Dec 27 00:35:27 2006 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Wed Dec 27 00:38:01 2006 +0000
     1.3 @@ -1555,6 +1555,8 @@ class XendDomainInfo:
     1.4          if boot:
     1.5              # HVM booting.
     1.6              self.info['image']['type'] = 'hvm'
     1.7 +            if not 'devices' in self.info['image']:
     1.8 +                self.info['image']['devices'] = {}
     1.9              self.info['image']['devices']['boot'] = boot
    1.10          elif not blexec and kernel:
    1.11              # Boot from dom0.  Nothing left to do -- the kernel and ramdisk

     2.1 --- a/tools/python/xen/xend/image.py	Wed Dec 27 00:35:27 2006 +0000
     2.2 +++ b/tools/python/xen/xend/image.py	Wed Dec 27 00:38:01 2006 +0000
     2.3 @@ -312,6 +312,9 @@ class HVMImageHandler(ImageHandler):
     2.4      def configure(self, vmConfig, imageConfig, deviceConfig):
     2.5          ImageHandler.configure(self, vmConfig, imageConfig, deviceConfig)
     2.6  
     2.7 +        if not self.kernel:
     2.8 +            self.kernel = '/usr/lib/xen/boot/hvmloader'
     2.9 +
    2.10          info = xc.xeninfo()
    2.11          if 'hvm' not in info['xen_caps']:
    2.12              raise VmError("HVM guest support is unavailable: is VT/AMD-V "