ia64/xen-unstable

changeset 2660:ffc49e9c4837

bitkeeper revision 1.1159.116.2 (4174f7f1RQu3OwnP5xs7FdzOKWZLwg)

Merge xenbk@gandalf:/var/bk/xeno-unstable.bk
into wray-m-3.hpl.hp.com:/home/mjw/repos-bk/xeno-unstable.bk
author mjw@wray-m-3.hpl.hp.com
date Tue Oct 19 11:18:09 2004 +0000 (2004-10-19)
parents 1314598e0d84 805372fcdaa4
children b977ef66a19e 7b0448e9f11d
files tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Tue Oct 19 11:16:51 2004 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Tue Oct 19 11:18:09 2004 +0000
     1.3 @@ -713,6 +713,10 @@ class XendDomainInfo:
     1.4          """Build the domain boot image.
     1.5          """
     1.6          if self.recreate or self.restore: return
     1.7 +        if not os.path.isfile(kernel):
     1.8 +            raise VmError('Kernel image does not exist: %s' % kernel)
     1.9 +        if ramdisk and not os.path.isfile(ramdisk):
    1.10 +            raise VmError('Kernel ramdisk does not exist: %s' % ramdisk)
    1.11          if len(cmdline) >= 256:
    1.12              log.warning('kernel cmdline too long, domain %d', self.dom)
    1.13          dom = self.dom
    1.14 @@ -738,11 +742,6 @@ class XendDomainInfo:
    1.15          @param ramdisk: kernel ramdisk
    1.16          @param cmdline: kernel commandline
    1.17          """
    1.18 -        if not self.recreate:
    1.19 -            if not os.path.isfile(kernel):
    1.20 -                raise VmError('Kernel image does not exist: %s' % kernel)
    1.21 -            if ramdisk and not os.path.isfile(ramdisk):
    1.22 -                raise VmError('Kernel ramdisk does not exist: %s' % ramdisk)
    1.23          #self.init_domain()
    1.24          if self.console:
    1.25              self.console.registerChannel()