bitkeeper revision 1.1159.1.314 (418442e0ulgOgW7-GQoSm-dOij6jwg)

Add dmesg clear op.

tools/python/xen/xend/XendClient.py

@@ -179,8 +179,12 @@ class Xend:
         return self.xendPost(self.nodeurl(),
                              {'op'      : 'reboot'})
 
-    def xend_node_dmesg(self):
-        return self.xendGet(self.nodeurl('dmesg'))
+    def xend_node_get_dmesg(self):
+            return self.xendGet(self.nodeurl('dmesg'))
+
+    def xend_node_clear_dmesg(self):
+        return self.xendPost(self.nodeurl('dmesg'),
+                             {'op' : 'clear' } )
 
     def xend_node_log(self):
         return self.xendGet(self.nodeurl('log'))

tools/python/xen/xend/XendDmesg.py

@@ -12,7 +12,9 @@ class XendDmesg:
 
     def info(self):
         return self.xc.readconsolering()
-        
+
+    def clear(self):
+        self.xc.readconsolering(True)
 
 def instance():
     global inst

tools/python/xen/xend/server/SrvDmesg.py

@@ -15,6 +15,9 @@ class SrvDmesg(SrvDir):
         SrvDir.__init__(self)
         self.xd = XendDmesg.instance()
 
+    def render_POST(self, req):
+        self.perform(req)
+
     def render_GET(self, req):
         try:
             if self.use_sxp(req):
@@ -32,3 +35,6 @@ class SrvDmesg(SrvDir):
             
     def info(self):
         return self.xd.info()
+
+    def op_clear(self):
+        self.xd.clear()

tools/python/xen/xm/main.py

@@ -665,7 +665,12 @@ class ProgDmesg(Prog):
     info  = """Print Xen boot output."""
 
     def main(self, args):
-        print server.xend_node_dmesg()
+        if len(args) == 1:
+            print server.xend_node_dmesg(clear)
+        if len(args) > 1:
+            if len(args) == 2 and args[1] == '-c':
+                print server.xend_node_clear_dmesg()
+            else: self.err("%s: Invalid argument" % args[0])
 
 xm.prog(ProgDmesg)
 
@@ -726,7 +731,7 @@ class ProgVbdCreate(Prog):
 Create a virtual block device for a domain.
 
   UNAME   - device to export, e.g. phy:hda2
-  DEV     - device name in the domain, e.g. xda1
+  DEV     - device name in the domain, e.g. sda1
   MODE    - access mode: r for read, w for read-write
   BACKEND - backend driver domain
 """