ia64/xen-unstable

changeset 2421:2c92a3484f05

bitkeeper revision 1.1159.69.4 (4138e7ddHCxMMHu0h-Wfahl7MyQaLQ)

Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xeno-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Fri Sep 03 21:53:33 2004 +0000 (2004-09-03)
parents 5d7a7c656fa3 0f251ff3f765
children 2274a0386cc9
files tools/python/xen/xend/XendDomain.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomain.py	Fri Sep 03 20:44:22 2004 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomain.py	Fri Sep 03 21:53:33 2004 +0000
     1.3 @@ -243,12 +243,12 @@ class XendDomain:
     1.4              if d['shutdown']:
     1.5                  reason = XendDomainInfo.shutdown_reason(d['shutdown_reason'])
     1.6                  log.debug('XendDomain>reap> shutdown id=%s reason=%s', id, reason)
     1.7 +                dominfo = self.domain_by_id.get(id)
     1.8 +                name = (dominfo and dominfo.name) or '??'
     1.9                  if reason in ['suspend']:
    1.10 -                    dominfo = self.domain_by_id.get(id)
    1.11                      if dominfo.is_terminated():
    1.12                          log.debug('XendDomain>reap> Suspended domain died id=%s', id)
    1.13                      else:
    1.14 -                        name = (dominfo and dominfo.name) or '??'
    1.15                          eserver.inject('xend.domain.suspended', [name, id])
    1.16                          continue
    1.17                  if reason in ['poweroff', 'reboot']: