[Xen-devel] [PATCH] xend: modify a warning log message

[Kouya Shimura <kouya@xxxxxxxxxxxxxx>]

When a HVM has shutdown, in spite of completely normal case, 
xend.log shows the warning:
===============================================================
 WARNING (image:490) domain XXX: device model failure: no longer running; see 
/var/log/xen/qemu-dm-hvm.log
===============================================================

It might confuse the user. This patch modifies the message as:
===============================================================
 INFO (image:553) XXX device model terminated
===============================================================


Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>

diff -r f6fd1c2e4da6 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Tue Mar 31 18:37:58 2009 +0100
+++ b/tools/python/xen/xend/image.py    Wed Apr 01 17:20:34 2009 +0900
@@ -529,8 +529,8 @@ class ImageHandler:
         try: self.sentinel_fifo.read(1)
         except OSError, e: pass
         self.sentinel_lock.acquire()
-        try:
-            if self.pid:
+        if self.pid:
+            try:
                 (p,st) = os.waitpid(self.pid, os.WNOHANG)
                 if p == self.pid:
                     message = oshelp.waitstatus_description(st)
@@ -542,15 +542,15 @@ class ImageHandler:
                     except:
                         message = "malfunctioning or died ?"
                 message = "pid %d: %s" % (self.pid, message)
-            else:
-                message = "no longer running"
-        except Exception, e:
-            message = "waitpid failed: %s" % utils.exception_string(e)
-        message = "device model failure: %s" % message
-        try: message += "; see %s " % self.logfile
-        except: pass
-        self._dmfailed(message)
-        self.pid = None
+            except Exception, e:
+                message = "waitpid failed: %s" % utils.exception_string(e)
+            message = "device model failure: %s" % message
+            try: message += "; see %s " % self.logfile
+            except: pass
+            self._dmfailed(message)
+            self.pid = None
+        else:
+            log.info("%s device model terminated", self.vm.getName())
         self.sentinel_lock.release()
 
     def destroyDeviceModel(self):

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel