diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-12-09 18:29:56 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-12-09 18:29:56 +0000 |
| commit | e044b31856ac35b2fe73b783fdd9c8e520434c12 (patch) | |
| tree | 0d7bd5e8bcf1b62e73e656b120ddca6c7e41cd80 | |
| parent | c03e136278e2c7e78e8f7ac2b5221974b89d73e3 (diff) | |
| download | xen-e044b31856ac35b2fe73b783fdd9c8e520434c12.tar.gz xen-e044b31856ac35b2fe73b783fdd9c8e520434c12.tar.bz2 xen-e044b31856ac35b2fe73b783fdd9c8e520434c12.zip | |
bitkeeper revision 1.1159.187.60 (41b899a4tjdjzfL7v1mQOH5gIHlqQQ)
Another sysrq fix...
| -rw-r--r-- | tools/python/xen/xend/XendClient.py | 2 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendDomain.py | 2 | ||||
| -rw-r--r-- | tools/python/xen/xend/server/SrvDaemon.py | 2 | ||||
| -rw-r--r-- | tools/python/xen/xend/server/domain.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py index 91efd5cc8e..4e733b7fde 100644 --- a/tools/python/xen/xend/XendClient.py +++ b/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, diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 4e614af54e..1b01b43cfa 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/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 diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py index 916d70a00c..338d6e4d4a 100644 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/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) diff --git a/tools/python/xen/xend/server/domain.py b/tools/python/xen/xend/server/domain.py index 17483dcc42..eb0dbcf48b 100644 --- a/tools/python/xen/xend/server/domain.py +++ b/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 |