1 files changed, 12 insertions, 49 deletions

diff --git a/tools/xenmgr/lib/XendDomain.py b/tools/xenmgr/lib/XendDomain.py
index 94afe3e87d..9ed3c6370d 100644
--- a/tools/xenmgr/lib/XendDomain.py
+++ b/tools/xenmgr/lib/XendDomain.py
@@ -18,6 +18,9 @@ import XendDomainInfo
 import XendConsole
 import EventServer
 
+from xenmgr.server import SrvConsoleServer
+xend = SrvConsoleServer.instance()
+
 eserver = EventServer.instance()
 
 __all__ = [ "XendDomain" ]
@@ -49,15 +52,16 @@ class XendDomain:
     def initial_refresh(self):
         """Refresh initial domain info from domain_db.
         """
-        print "initial_refresh> db=", self.domain_db.values()
+        print "initial_refresh>"
+        for d in self.domain_db.values(): print 'db dom=', d
         domlist = xc.domain_getinfo()
-        print "doms=", domlist
+        for d in domlist: print 'xc dom=', d
         doms = {}
         for d in domlist:
             domid = str(d['dom'])
             doms[domid] = d
         for config in self.domain_db.values():
-            domid = int(sxp.child_value(config, 'id'))
+            domid = str(sxp.child_value(config, 'id'))
             print "dom=", domid, "config=", config
             if domid in doms:
                 print "dom=", domid, "new"
@@ -141,7 +145,7 @@ class XendDomain:
                 config = None
                 image = None
                 newinfo = XendDomainInfo.XendDomainInfo(
-                    config, d['dom'], d['name'], d['mem_kb']/1024, image)
+                    config, d['dom'], d['name'], d['mem_kb']/1024, image=image, info=d)
                 self._add_domain(newinfo.id, newinfo)
         # Remove entries for domains that no longer exist.
         for d in self.domain.values():
@@ -193,13 +197,13 @@ class XendDomain:
         """
         dom = int(id)
         eserver.inject('xend.domain.start', id)
-        return xc.domain_start(dom=dom)
+        return xend.domain_start(dom)
     
     def domain_stop(self, id):
         """Stop domain running.
         """
         dom = int(id)
-        return xc.domain_stop(dom=dom)
+        return xend.domain_stop(dom)
     
     def domain_shutdown(self, id):
         """Shutdown domain (nicely).
@@ -208,7 +212,7 @@ class XendDomain:
         if dom <= 0:
             return 0
         eserver.inject('xend.domain.shutdown', id)
-        val = xc.domain_destroy(dom=dom, force=0)
+        val = xend.domain_destroy(dom, force=0)
         self.refresh()
         return val
     
@@ -219,7 +223,7 @@ class XendDomain:
         if dom <= 0:
             return 0
         eserver.inject('xend.domain.halt', id)
-        val = xc.domain_destroy(dom=dom, force=1)
+        val = xend.domain_destroy(dom, force=1)
         self.refresh()
         return val       
 
@@ -247,21 +251,6 @@ class XendDomain:
         self._add_domain(dominfo.id, dominfo)
         return dominfo
     
-    def domain_device_add(self, id, info):
-        """Add a device to a domain.
-        """
-        pass
-    
-    def domain_device_remove(self, id, dev):
-        """Delete a device from a domain.
-        """
-        pass
-    
-    def domain_device_configure(self, id, dev, info):
-        """Configure a domain device.
-        """
-        pass
-
     #============================================================================
     # Backward compatibility stuff from here on.
 
@@ -297,23 +286,10 @@ class XendDomain:
         if not dominfo: return None
         return dominfo.get_device_by_index(vif)
 
-    def domain_vif_stats(self, dom, vif):
-        dom = int(dom)
-        return xc.vif_stats_get(dom=dom, vif=vif)
-
     def domain_vif_ip_add(self, dom, vif, ip):
         dom = int(dom)
         return xenctl.ip.setup_vfr_rules_for_vif(dom, vif, ip)
 
-    def domain_vif_scheduler_set(self, dom, vif, bytes, usecs):
-        dom = int(dom)
-        return xc.xc_vif_scheduler_set(dom=dom, vif=vif,
-                                       credit_bytes=bytes, credit_usecs=usecs)
-
-    def domain_vif_scheduler_get(self, dom, vif):
-        dom = int(dom)
-        return xc.vif_scheduler_get(dom=dom, vif=vif)
-
     def domain_vbd_ls(self, dom):
         dominfo = self.domain_get(dom)
         if not dominfo: return []
@@ -329,19 +305,6 @@ class XendDomain:
                 return v
         return None
 
-##     def domain_vbd_add(self, dom, uname, dev, mode):
-##         dom = int(dom)
-##         vbd = vm.make_disk(dom, uname, dev, mode)
-##         return vbd
-
-##     def domain_vbd_remove(self, dom, dev):
-##         dom = int(dom)
-##         vbd = xenctl.vdisk.blkdev_name_to_number(dev)
-##         if vbd < 0: return vbd
-##         err = xc.vbd_destroy(dom, vbd)
-##         if err < 0: return err
-##         return vbd
-
     def domain_shadow_control(self, dom, op):
         dom = int(dom)
         return xc.shadow_control(dom, op)