ia64/xen-unstable

changeset 19488:79f734040a83

xend: modify a warning log message

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Apr 01 11:47:59 2009 +0100 (2009-04-01)
parents 5d701be7c37b
children 443b3bb740e2
files tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/python/xen/xend/image.py	Wed Apr 01 11:47:25 2009 +0100
     1.2 +++ b/tools/python/xen/xend/image.py	Wed Apr 01 11:47:59 2009 +0100
     1.3 @@ -534,8 +534,8 @@ class ImageHandler:
     1.4          try: self.sentinel_fifo.read(1)
     1.5          except OSError, e: pass
     1.6          self.sentinel_lock.acquire()
     1.7 -        try:
     1.8 -            if self.pid:
     1.9 +        if self.pid:
    1.10 +            try:
    1.11                  (p,st) = os.waitpid(self.pid, os.WNOHANG)
    1.12                  if p == self.pid:
    1.13                      message = oshelp.waitstatus_description(st)
    1.14 @@ -547,15 +547,15 @@ class ImageHandler:
    1.15                      except:
    1.16                          message = "malfunctioning or died ?"
    1.17                  message = "pid %d: %s" % (self.pid, message)
    1.18 -            else:
    1.19 -                message = "no longer running"
    1.20 -        except Exception, e:
    1.21 -            message = "waitpid failed: %s" % utils.exception_string(e)
    1.22 -        message = "device model failure: %s" % message
    1.23 -        try: message += "; see %s " % self.logfile
    1.24 -        except: pass
    1.25 -        self._dmfailed(message)
    1.26 -        self.pid = None
    1.27 +            except Exception, e:
    1.28 +                message = "waitpid failed: %s" % utils.exception_string(e)
    1.29 +            message = "device model failure: %s" % message
    1.30 +            try: message += "; see %s " % self.logfile
    1.31 +            except: pass
    1.32 +            self._dmfailed(message)
    1.33 +            self.pid = None
    1.34 +        else:
    1.35 +            log.info("%s device model terminated", self.vm.getName())
    1.36          self.sentinel_lock.release()
    1.37  
    1.38      def destroyDeviceModel(self):