bitkeeper revision 1.1159.187.60 (41b899a4tjdjzfL7v1mQOH5gIHlqQQ)

Another sysrq fix...

tools/python/xen/xend/XendClient.py

@@ -228,7 +228,7 @@ class Xend:
         return self.xendPost(self.domainurl(id),
                              {'op'      : 'pause' })
 
-    def xend_domain_shutdown(self, id, reason, key=None):
+    def xend_domain_shutdown(self, id, reason, key=0):
         return self.xendPost(self.domainurl(id),
                              {'op'      : 'shutdown',
                               'reason'  : reason,

tools/python/xen/xend/XendDomain.py

@@ -455,7 +455,7 @@ class XendDomain:
         except Exception, ex:
             raise XendError(str(ex))
     
-    def domain_shutdown(self, id, reason='poweroff', key=None):
+    def domain_shutdown(self, id, reason='poweroff', key=0):
         """Shutdown domain (nicely).
          - poweroff: restart according to exit code and restart mode
          - reboot:   restart on exit

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

@@ -711,7 +711,7 @@ class Daemon:
             raise XendError('Invalid console id')
         console.disconnect()
 
-    def domain_shutdown(self, dom, reason, key=None):
+    def domain_shutdown(self, dom, reason, key=0):
         """Shutdown a domain.
         """
         dom = int(dom)

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

@@ -37,7 +37,7 @@ class DomainController(controller.Controller):
         self.addMethod(CMSG_MEM_REQUEST, 0, None)
         self.registerChannel()
 
-    def shutdown(self, reason, key=None):
+    def shutdown(self, reason, key=0):
         """Shutdown a domain.
 
         reason shutdown reason