bitkeeper revision 1.1236.28.1 (42340a42zVMF1dHpLj0Rzok7P9t48Q)

Manual merge.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --cc linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
Simple merge

diff --cc tools/python/xen/xend/server/SrvDaemon.py
index 117ae2a973676d6ab4915d48309880d6e6f489b7,9bf5fd9bb05670caa5db80773f273c73a7785052..2ca8f38f99fcb2c8a8c6e377be53cb56167b4bdb
--- 1/tools/python/xen/xend/server/SrvDaemon.py
--- 2/tools/python/xen/xend/server/SrvDaemon.py
+++ b/tools/python/xen/xend/server/SrvDaemon.py
@@@ -622,12 -620,13 +622,14 @@@ class Daemon
          self.domainCF = domain.DomainControllerFactory()
          self.blkifCF = blkif.BlkifControllerFactory()
          self.netifCF = netif.NetifControllerFactory()
 +        self.usbifCF = usbif.UsbifControllerFactory()
          self.consoleCF = console.ConsoleControllerFactory()
  
-     def listenEvent(self):
+     def listenEvent(self, xroot):
          protocol = EventFactory(self)
-         return reactor.listenTCP(EVENT_PORT, protocol)
+         port = xroot.get_xend_event_port()
+         interface = xroot.get_xend_address()
+         return reactor.listenTCP(port, protocol, interface=interface)
  
      def listenNotifier(self):
          protocol = NotifierProtocol(self.channelF)

diff --cc xen/include/public/xen.h
Simple merge