[Xen-changelog] [xen-unstable] Revert 17731:eafb252f141.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1211885443 -3600
# Node ID 634fe9f86d62e3e4dc416f64b4ade6b31b0926e7
# Parent  e265878e8f657ca532ebe98b5bac233f395f2814
Revert 17731:eafb252f141.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/server/SrvServer.py |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff -r e265878e8f65 -r 634fe9f86d62 tools/python/xen/xend/server/SrvServer.py
--- a/tools/python/xen/xend/server/SrvServer.py Tue May 27 10:35:10 2008 +0100
+++ b/tools/python/xen/xend/server/SrvServer.py Tue May 27 11:50:43 2008 +0100
@@ -44,7 +44,6 @@ import re
 import re
 import time
 import signal
-import os
 from threading import Thread
 
 from xen.web.httpserver import HttpServer, UnixHttpServer
@@ -149,27 +148,14 @@ class XendServers:
 
             # Reaching this point means we can auto start domains
             try:
-                dom = xenddomain()
-                dom.autostart_domains()
+                xenddomain().autostart_domains()
             except Exception, e:
                 log.exception("Failed while autostarting domains")
 
             # loop to keep main thread alive until it receives a SIGTERM
             self.running = True
             while self.running:
-                # loop to destroy those hvm domain that whoes DM has dead 
unexpectedly.
-                for item in dom.domains.values():
-                    if item.info.is_hvm():
-                        device_model_pid = 
item.gatherDom(('image/device-model-pid', str))
-                        dm_stat_cmd = "ps -o stat --no-headers 
-p"+device_model_pid
-                        dm_stat = os.popen(dm_stat_cmd).readline().rstrip()
-                        if dm_stat == 'Z':
-                            log.warn("Devices Model for domain " + 
str(item.domid) + "was killed unexpectedly")
-                            item.info['crashed'] = 1
-                            item.refreshShutdown(item.info)
-                        else:
-                            continue
-                time.sleep(30)
+                time.sleep(100000000)
                 
             if self.reloadingConfig:
                 log.info("Restarting all XML-RPC and Xen-API servers...")

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