diff options
author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-06-06 13:04:01 +0000 |
---|---|---|
committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-06-06 13:04:01 +0000 |
commit | 94a75e0212c2986a8fd7e46534fb313c485fe3e8 (patch) | |
tree | ffd43ded7d9419d14a9a0153ff2d87a89945841d /tools | |
parent | 31164a82a2bc69e9ecf8bca27a2d167ec0546fc7 (diff) | |
download | xen-94a75e0212c2986a8fd7e46534fb313c485fe3e8.tar.gz xen-94a75e0212c2986a8fd7e46534fb313c485fe3e8.tar.bz2 xen-94a75e0212c2986a8fd7e46534fb313c485fe3e8.zip |
bitkeeper revision 1.1662.1.4 (42a449c17mlN0vfY0fcb2leEnvVb-A)
usbif.py, netif.py, controller.py, console.py, blkif.py, XendDomainInfo.py:
Cleanup imports.
XendDomain.py:
Cleanup imports and some function comments.
BUG: Add back missing _add_domain call in domain_create.
SrvDaemon.py:
g/c DEBUG and DAEMONIZE.
XendCheckpoint.py:
Cleanup domain id/name confusion.
Signed-off-by: Mike Wray <mike.wray@hp.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/python/xen/xend/XendCheckpoint.py | 4 | ||||
-rw-r--r-- | tools/python/xen/xend/XendDomain.py | 41 | ||||
-rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 22 | ||||
-rw-r--r-- | tools/python/xen/xend/server/SrvDaemon.py | 3 | ||||
-rwxr-xr-x | tools/python/xen/xend/server/blkif.py | 14 | ||||
-rwxr-xr-x | tools/python/xen/xend/server/console.py | 6 | ||||
-rwxr-xr-x | tools/python/xen/xend/server/controller.py | 2 | ||||
-rwxr-xr-x | tools/python/xen/xend/server/netif.py | 6 | ||||
-rw-r--r-- | tools/python/xen/xend/server/usbif.py | 6 |
9 files changed, 47 insertions, 57 deletions
diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index 1084d228a9..654fb022c5 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -63,10 +63,10 @@ def save(xd, fd, dominfo): if fd == child.fromchild.fileno(): l = child.fromchild.readline() if l.rstrip() == "suspend": - log.info("suspending %s" % dominfo.id) + log.info("suspending %d" % dominfo.id) xd.domain_shutdown(dominfo.id, reason='suspend') dominfo.state_wait("suspended") - log.info("suspend %s done" % dominfo.id) + log.info("suspend %d done" % dominfo.id) child.tochild.write("done\n") child.tochild.flush() if filter(lambda (fd, event): event & select.POLLHUP, r): diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 5aeb42ca85..c7102a6f50 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -7,25 +7,23 @@ """ import errno import os -import scheduler -import string import sys -import traceback import time +import traceback import xen.lowlevel.xc; xc = xen.lowlevel.xc.new() -from xen.xend.server import relocate -import sxp -import XendRoot; xroot = XendRoot.instance() -import XendCheckpoint -import XendDB +from xen.xend import sxp +from xen.xend import XendRoot; xroot = XendRoot.instance() +from xen.xend import XendCheckpoint from xen.xend.XendDomainInfo import XendDomainInfo, shutdown_reason -import EventServer; eserver = EventServer.instance() -from XendError import XendError -from XendLogging import log - +from xen.xend import EventServer; eserver = EventServer.instance() +from xen.xend.XendError import XendError +from xen.xend.XendLogging import log +from xen.xend import scheduler from xen.xend.server import channel +from xen.xend.server import relocate +from xen.xend import XendDB __all__ = [ "XendDomain" ] @@ -55,7 +53,6 @@ class XendDomain: # So we stuff the XendDomain instance (self) into xroot's components. xroot.add_component("xen.xend.XendDomain", self) self.domains = XendDomainDict() - # Table of domain info indexed by domain id. self.db = XendDB.XendDB(self.dbpath) eserver.subscribe('xend.virq', self.onVirq) self.initial_refresh() @@ -160,9 +157,9 @@ class XendDomain: info = self.domains.get(id) if info: del self.domains[id] + self.db.delete(str(id)) if notify: eserver.inject('xend.domain.died', [info.name, info.id]) - self.db.delete(str(id)) def reap(self): """Look for domains that have crashed or stopped. @@ -179,11 +176,9 @@ class XendDomain: casualties.append(d) for d in casualties: id = d['dom'] - #print 'reap>', id dominfo = self.domains.get(id) name = (dominfo and dominfo.name) or '??' if dominfo and dominfo.is_terminated(): - #print 'reap> already terminated:', id continue log.debug('XendDomain>reap> domain died name=%s id=%d', name, id) if d['shutdown']: @@ -268,6 +263,7 @@ class XendDomain: @return: domain """ dominfo = XendDomainInfo.create(config) + self._add_domain(dominfo) return dominfo def domain_restart(self, dominfo): @@ -296,14 +292,13 @@ class XendDomain: """Configure an existing domain. This is intended for internal use by domain restore and migrate. - @param id: domain id @param vmconfig: vm configuration """ config = sxp.child_value(vmconfig, 'config') dominfo = XendDomainInfo.restore(config) self._add_domain(dominfo) return dominfo - + def domain_restore(self, src, progress=False): """Restore a domain from file. @@ -604,7 +599,7 @@ class XendDomain: @param id: domain id @param devconfig: device configuration - @param devid: device index + @param devid: device id @return: updated device configuration """ dominfo = self.domain_lookup(id) @@ -616,7 +611,7 @@ class XendDomain: """Refresh a device. @param id: domain id - @param devid: device index + @param devid: device id @param type: device type """ dominfo = self.domain_lookup(id) @@ -628,7 +623,7 @@ class XendDomain: """Destroy a device. @param id: domain id - @param devid: device index + @param devid: device id @param type: device type """ dominfo = self.domain_lookup(id) @@ -648,10 +643,10 @@ class XendDomain: def domain_devtype_get(self, id, type, devid): """Get a device from a domain. - + @param id: domain @param type: device type - @param devid: device index + @param devid: device id @return: device object (or None) """ dominfo = self.domain_lookup(id) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index f7a7668638..1746985ced 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -14,21 +14,20 @@ import time import threading import xen.lowlevel.xc; xc = xen.lowlevel.xc.new() -import xen.util.ip -from xen.xend.server import channel, controller +from xen.util.ip import check_subnet, get_current_ipgw from xen.util.blkif import blkdev_uname_to_file -from server.channel import channelFactory -import server.SrvDaemon; xend = server.SrvDaemon.instance() -from server import messages +from xen.xend.server import channel, controller +from xen.xend.server import SrvDaemon; xend = SrvDaemon.instance() +from xen.xend.server import messages +from xen.xend.server.channel import channelFactory +from xen.xend import sxp +from xen.xend.PrettyPrint import prettyprintstring from xen.xend.XendBootloader import bootloader -import sxp -from XendLogging import log +from xen.xend.XendLogging import log from XendError import XendError, VmError -from XendRoot import get_component - -from PrettyPrint import prettyprintstring +from xen.xend.XendRoot import get_component """Flag for a block device backend domain.""" SIF_BLK_BE_DOMAIN = (1<<4) @@ -145,7 +144,6 @@ def add_device_handler(name, type): def get_device_handler(name): return device_handlers[name] - def dom_get(dom): """Get info from xen for an existing domain. @@ -321,7 +319,7 @@ class XendDomainInfo: def __str__(self): s = "domain" - s += " id=" + self.id + s += " id=" + str(self.id) s += " name=" + self.name s += " memory=" + str(self.memory) console = self.getConsole() diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py index ec418d5bea..51745ca465 100644 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/tools/python/xen/xend/server/SrvDaemon.py @@ -32,9 +32,6 @@ import event import relocate from params import * -DAEMONIZE = 0 -DEBUG = 1 - class Daemon: """The xend daemon. """ diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index 817ae1b6c4..7c38dec903 100755 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -3,16 +3,16 @@ """ import string -from xen.xend import sxp -from xen.xend import Blkctl -from xen.xend.XendError import XendError, VmError -from xen.xend.XendLogging import log from xen.util import blkif +from xen.xend.XendError import XendError, VmError from xen.xend.XendRoot import get_component +from xen.xend.XendLogging import log +from xen.xend import sxp +from xen.xend import Blkctl -import channel -from controller import CtrlMsgRcvr, Dev, DevController -from messages import * +from xen.xend.server import channel +from xen.xend.server.controller import CtrlMsgRcvr, Dev, DevController +from xen.xend.server.messages import * class BlkifBackend: """ Handler for the 'back-end' channel to a block device driver domain diff --git a/tools/python/xen/xend/server/console.py b/tools/python/xen/xend/server/console.py index f3dade883b..4f2a498aac 100755 --- a/tools/python/xen/xend/server/console.py +++ b/tools/python/xen/xend/server/console.py @@ -14,9 +14,9 @@ from xen.xend.XendLogging import log from xen.xend import XendRoot; xroot = XendRoot.instance() from xen.xend import sxp -from controller import CtrlMsgRcvr, Dev, DevController -from messages import * -from params import * +from xen.xend.server.controller import CtrlMsgRcvr, Dev, DevController +from xen.xend.server.messages import * +from xen.xend.server.params import * class ConsoleProtocol(protocol.Protocol): """Asynchronous handler for a console socket. diff --git a/tools/python/xen/xend/server/controller.py b/tools/python/xen/xend/server/controller.py index 9205b2778e..0459d0b9fc 100755 --- a/tools/python/xen/xend/server/controller.py +++ b/tools/python/xen/xend/server/controller.py @@ -4,7 +4,7 @@ for a domain. """ from xen.xend.XendError import XendError -from messages import msgTypeName, printMsg, getMessageType +from xen.xend.server.messages import msgTypeName, printMsg, getMessageType DEBUG = 0 diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py index 7c77810eba..90e41d03da 100755 --- a/tools/python/xen/xend/server/netif.py +++ b/tools/python/xen/xend/server/netif.py @@ -11,9 +11,9 @@ from xen.xend.XendLogging import log from xen.xend import XendVnet from xen.xend.XendRoot import get_component -import channel -from controller import CtrlMsgRcvr, Dev, DevController -from messages import * +from xen.xend.server import channel +from xen.xend.server.controller import CtrlMsgRcvr, Dev, DevController +from xen.xend.server.messages import * class NetDev(Dev): """A network device. diff --git a/tools/python/xen/xend/server/usbif.py b/tools/python/xen/xend/server/usbif.py index 9535fdd202..f64ea83d4b 100644 --- a/tools/python/xen/xend/server/usbif.py +++ b/tools/python/xen/xend/server/usbif.py @@ -8,9 +8,9 @@ from xen.xend import sxp from xen.xend.XendLogging import log from xen.xend.XendError import XendError -import channel -from controller import Dev, DevController -from messages import * +from xen.xend.server import channel +from xen.xend.server.controller import Dev, DevController +from xen.xend.server.messages import * class UsbBackend: """Handler for the 'back-end' channel to a USB device driver domain |