[Xen-changelog] merge?

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 2f5537317988865e0625e7d18e45d10fb1bbdb92
# Parent  e85f93d1ca599d12eb1f2d28f1526dd2e3410d68
# Parent  753c49dc808c9d51eb725a8692cd4ab8cdfee75b
merge?

diff -r e85f93d1ca59 -r 2f5537317988 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Thu Sep 15 16:55:05 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Thu Sep 15 16:55:32 2005
@@ -354,7 +354,8 @@
         else:
             di = dom_get(self.domid)
             if not di:
-                return 
+                return
+            self.info = di 
         self.memory = self.info['mem_kb'] / 1024
         self.ssidref = self.info['ssidref']
 

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