[Xen-changelog] XendDomainInfo.py, XendDomain.py:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1549, 2005/05/25 11:56:29+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        XendDomainInfo.py, XendDomain.py:
          Disable shutdown timeout for suspend.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 XendDomain.py     |    2 +-
 XendDomainInfo.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


diff -Nru a/tools/python/xen/xend/XendDomain.py 
b/tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       2005-05-25 07:02:42 -04:00
+++ b/tools/python/xen/xend/XendDomain.py       2005-05-25 07:02:42 -04:00
@@ -402,7 +402,7 @@
         if reason == 'halt':
             reason = 'poweroff'
         val = dominfo.shutdown(reason, key=key)
-        if reason != 'sysrq':
+        if not reason in ['suspend', 'sysrq']:
             self.domain_shutdowns()
         return val
 
diff -Nru a/tools/python/xen/xend/XendDomainInfo.py 
b/tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   2005-05-25 07:02:42 -04:00
+++ b/tools/python/xen/xend/XendDomainInfo.py   2005-05-25 07:02:42 -04:00
@@ -1136,7 +1136,7 @@
         if self.channel:
             msg = messages.packMsg(msgtype, extra)
             self.channel.writeRequest(msg)
-        if reason != 'sysrq':
+        if not reason in ['suspend', 'sysrq']:
             self.shutdown_pending = {'start':time.time(), 'reason':reason,
                                      'key':key}
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog