File xend-console-port-restore.patch of Package xen.854

Pass console_port to completeRestore() so that console/port is written to
xenstore.  See bnc#706574

From: Chunyan Liu <cyliu@novell.com>

Index: xen-4.0.3-testing/tools/python/xen/xend/XendCheckpoint.py
===================================================================
--- xen-4.0.3-testing.orig/tools/python/xen/xend/XendCheckpoint.py
+++ xen-4.0.3-testing/tools/python/xen/xend/XendCheckpoint.py
@@ -405,8 +405,7 @@ def restore(xd, fd, dominfo = None, paus
         restore_image.setCpuid()
 
         # xc_restore will wait for source to close connection
-        
-        dominfo.completeRestore(handler.store_mfn, handler.console_mfn)
+        dominfo.completeRestore(handler.store_mfn, handler.console_mfn, console_port)
 
         wait_devs(dominfo)
 
Index: xen-4.0.3-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-4.0.3-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.0.3-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -3046,7 +3046,7 @@ class XendDomainInfo:
     # TODO: recategorise - called from XendCheckpoint
     # 
 
-    def completeRestore(self, store_mfn, console_mfn):
+    def completeRestore(self, store_mfn, console_mfn, console_port):
 
         log.debug("XendDomainInfo.completeRestore")
 
@@ -3057,6 +3057,7 @@ class XendDomainInfo:
         self.image = image.create(self, self.info)
         if self.image:
             self._createDevices(True)
+        self.console_port = console_port
         self._storeDomDetails()
         self._registerWatches()
         self.refreshShutdown()
openSUSE Build Service is sponsored by