debuggers.hg

changeset 3301:bf681d2cb7c8

find changesets by author, revision, files, or words in the commit message
bitkeeper revision 1.1159.183.49 (41b899c8PdoHYXfdUBjvgkdUlJjeDw)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Thu Dec 09 18:30:32 2004 +0000 (2004-12-09)
parents 5088989be882 a53d1c93c3ab
children fd0d4d8e6193 c00fbb136368
files tools/python/xen/xend/XendClient.py tools/python/xen/xend/XendDomain.py tools/python/xen/xend/server/SrvDaemon.py tools/python/xen/xend/server/domain.py
line diff
     1.1 --- a/tools/python/xen/xend/XendClient.py	Thu Dec 09 17:40:18 2004 +0000
     1.2 +++ b/tools/python/xen/xend/XendClient.py	Thu Dec 09 18:30:32 2004 +0000
     1.3 @@ -228,7 +228,7 @@ class Xend:
     1.4          return self.xendPost(self.domainurl(id),
     1.5                               {'op'      : 'pause' })
     1.6  
     1.7 -    def xend_domain_shutdown(self, id, reason, key=None):
     1.8 +    def xend_domain_shutdown(self, id, reason, key=0):
     1.9          return self.xendPost(self.domainurl(id),
    1.10                               {'op'      : 'shutdown',
    1.11                                'reason'  : reason,

     2.1 --- a/tools/python/xen/xend/XendDomain.py	Thu Dec 09 17:40:18 2004 +0000
     2.2 +++ b/tools/python/xen/xend/XendDomain.py	Thu Dec 09 18:30:32 2004 +0000
     2.3 @@ -455,7 +455,7 @@ class XendDomain:
     2.4          except Exception, ex:
     2.5              raise XendError(str(ex))
     2.6      
     2.7 -    def domain_shutdown(self, id, reason='poweroff', key=None):
     2.8 +    def domain_shutdown(self, id, reason='poweroff', key=0):
     2.9          """Shutdown domain (nicely).
    2.10           - poweroff: restart according to exit code and restart mode
    2.11           - reboot:   restart on exit

     3.1 --- a/tools/python/xen/xend/server/SrvDaemon.py	Thu Dec 09 17:40:18 2004 +0000
     3.2 +++ b/tools/python/xen/xend/server/SrvDaemon.py	Thu Dec 09 18:30:32 2004 +0000
     3.3 @@ -711,7 +711,7 @@ class Daemon:
     3.4              raise XendError('Invalid console id')
     3.5          console.disconnect()
     3.6  
     3.7 -    def domain_shutdown(self, dom, reason, key=None):
     3.8 +    def domain_shutdown(self, dom, reason, key=0):
     3.9          """Shutdown a domain.
    3.10          """
    3.11          dom = int(dom)

     4.1 --- a/tools/python/xen/xend/server/domain.py	Thu Dec 09 17:40:18 2004 +0000
     4.2 +++ b/tools/python/xen/xend/server/domain.py	Thu Dec 09 18:30:32 2004 +0000
     4.3 @@ -37,7 +37,7 @@ class DomainController(controller.Contro
     4.4          self.addMethod(CMSG_MEM_REQUEST, 0, None)
     4.5          self.registerChannel()
     4.6  
     4.7 -    def shutdown(self, reason, key=None):
     4.8 +    def shutdown(self, reason, key=0):
     4.9          """Shutdown a domain.
    4.10  
    4.11          reason shutdown reason