# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Node ID 516821812322fe0290794f499bd758a47af4c3e5
# Parent 645ef4726bce548ee348f1a9333020bd7d23826f
[XEND] Revert changes in changeset 12328
Mistakenly reverted some fixes for rebooting, un-reverting.
Signed-off-by: Alastair Tse <atse@xxxxxxxxxxxxx>
---
tools/python/xen/xend/XendDomain.py | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff -r 645ef4726bce -r 516821812322 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py Fri Nov 17 15:53:29 2006 +0000
+++ b/tools/python/xen/xend/XendDomain.py Fri Nov 17 17:03:59 2006 +0000
@@ -377,24 +377,12 @@ class XendDomain:
@rtype: None
"""
- # update information for all running domains
- # - like cpu_time, status, dying, etc.
running = self._running_domains()
- running_domids = [d['domid'] for d in running if d['dying'] != 1]
-
- # remove domains that are not running from active domain list.
- # The list might have changed by now, because the update call may
- # cause new domains to be added, if the domain has rebooted. We get
- # the list again.
- for domid, dom in self.domains.items():
- if domid not in running_domids and domid != DOM0_ID:
- self._remove_domain(dom, domid)
-
# Add domains that are not already tracked but running in Xen,
# and update domain state for those that are running and tracked.
for dom in running:
domid = dom['domid']
- if domid in self.domains and dom['dying'] != 1:
+ if domid in self.domains:
self.domains[domid].update(dom)
elif domid not in self.domains and dom['dying'] != 1:
try:
@@ -407,6 +395,19 @@ class XendDomain:
except:
log.exception("Hard destruction of domain failed: %d" %
domid)
+
+ # update information for all running domains
+ # - like cpu_time, status, dying, etc.
+ # remove domains that are not running from active domain list.
+ # The list might have changed by now, because the update call may
+ # cause new domains to be added, if the domain has rebooted. We get
+ # the list again.
+ running = self._running_domains()
+ running_domids = [d['domid'] for d in running if d['dying'] != 1]
+ for domid, dom in self.domains.items():
+ if domid not in running_domids and domid != DOM0_ID:
+ self._remove_domain(dom, domid)
+
def _add_domain(self, info):
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home