ia64/xen-unstable

changeset 5147:63d8220a9b26

bitkeeper revision 1.1549 (429459dd8Wdn9xpYhxSGQBJEie8pXA)

XendDomainInfo.py, XendDomain.py:
Disable shutdown timeout for suspend.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Wed May 25 10:56:29 2005 +0000 (2005-05-25)
parents de3abc161c24
children 561f71aa056d
files tools/python/xen/xend/XendDomain.py tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomain.py	Wed May 25 10:36:59 2005 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomain.py	Wed May 25 10:56:29 2005 +0000
     1.3 @@ -402,7 +402,7 @@ class XendDomain:
     1.4          if reason == 'halt':
     1.5              reason = 'poweroff'
     1.6          val = dominfo.shutdown(reason, key=key)
     1.7 -        if reason != 'sysrq':
     1.8 +        if not reason in ['suspend', 'sysrq']:
     1.9              self.domain_shutdowns()
    1.10          return val
    1.11  
     2.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Wed May 25 10:36:59 2005 +0000
     2.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Wed May 25 10:56:29 2005 +0000
     2.3 @@ -1136,7 +1136,7 @@ class XendDomainInfo:
     2.4          if self.channel:
     2.5              msg = messages.packMsg(msgtype, extra)
     2.6              self.channel.writeRequest(msg)
     2.7 -        if reason != 'sysrq':
     2.8 +        if not reason in ['suspend', 'sysrq']:
     2.9              self.shutdown_pending = {'start':time.time(), 'reason':reason,
    2.10                                       'key':key}
    2.11