ia64/xen-unstable

changeset 6678:652bd7876153

Remove python virq code.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Wed Sep 07 14:19:05 2005 +0000 (2005-09-07)
parents c9e1ddf85324
children acde14d25398
files tools/python/xen/xend/server/SrvDaemon.py tools/python/xen/xend/server/channel.py
line diff
     1.1 --- a/tools/python/xen/xend/server/SrvDaemon.py	Wed Sep 07 13:41:49 2005 +0000
     1.2 +++ b/tools/python/xen/xend/server/SrvDaemon.py	Wed Sep 07 14:19:05 2005 +0000
     1.3 @@ -316,10 +316,6 @@ class Daemon:
     1.4          self.channelF = channel.channelFactory()
     1.5  
     1.6      def listenChannels(self):
     1.7 -        def virqReceived(virq):
     1.8 -            eserver.inject('xend.virq', virq)
     1.9 -
    1.10 -        self.channelF.setVirqHandler(virqReceived)
    1.11          self.channelF.start()
    1.12  
    1.13      def exit(self, rc=0):
     2.1 --- a/tools/python/xen/xend/server/channel.py	Wed Sep 07 13:41:49 2005 +0000
     2.2 +++ b/tools/python/xen/xend/server/channel.py	Wed Sep 07 14:19:05 2005 +0000
     2.3 @@ -145,22 +145,10 @@ class ChannelFactory:
     2.4  
     2.5      notifier = None
     2.6  
     2.7 -    """Map of ports to the virq they signal."""
     2.8 -    virqPorts = None
     2.9 -
    2.10      def __init__(self):
    2.11          """Constructor - do not use. Use the channelFactory function."""
    2.12          self.channels = {}
    2.13 -        self.virqPorts = {}
    2.14          self.notifier = xu.notifier()
    2.15 -        # Register interest in virqs.
    2.16 -        self.bind_virq(xen.lowlevel.xc.VIRQ_DOM_EXC)
    2.17 -        self.virqHandler = None
    2.18 -
    2.19 -    def bind_virq(self, virq):
    2.20 -        port = self.notifier.bind_virq(virq)
    2.21 -        self.virqPorts[port] = virq
    2.22 -        log.info("Virq %s on port %s", virq, port)
    2.23  
    2.24      def start(self):
    2.25          """Fork a thread to read messages.
    2.26 @@ -184,11 +172,7 @@ class ChannelFactory:
    2.27              if self.thread == None: return
    2.28              port = self.notifier.read()
    2.29              if port:
    2.30 -                virq = self.virqPorts.get(port)
    2.31 -                if virq is not None:
    2.32 -                    self.virqReceived(virq)
    2.33 -                else:
    2.34 -                    self.msgReceived(port)
    2.35 +                self.msgReceived(port)
    2.36              else:
    2.37                  select.select([self.notifier], [], [], 1.0)
    2.38  
    2.39 @@ -218,15 +202,6 @@ class ChannelFactory:
    2.40          thread.setDaemon(True)
    2.41          thread.start()
    2.42  
    2.43 -    def setVirqHandler(self, virqHandler):
    2.44 -        self.virqHandler = virqHandler
    2.45 -
    2.46 -    def virqReceived(self, virq):
    2.47 -        if DEBUG:
    2.48 -            print 'virqReceived>', virq
    2.49 -        if not self.virqHandler: return
    2.50 -        self.runInThread(lambda virq=virq: self.virqHandler(virq))
    2.51 -
    2.52      def newChannel(self, dom, local_port, remote_port):
    2.53          """Create a new channel.
    2.54          """
    2.55 @@ -547,9 +522,6 @@ class Channel:
    2.56              printMsg(msg)
    2.57          self.queue.response(getMessageId(msg), msg)
    2.58  
    2.59 -    def virq(self):
    2.60 -        self.factory.virq()
    2.61 -
    2.62  class Response:
    2.63      """Entry in the response queue.
    2.64      Used to signal a response to a message.