[Xen-changelog] Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1716, 2005/06/17 21:47:52+01:00, iap10@xxxxxxxxxxxxxxxxxxxxx

        Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
        into 
freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk



 XendDomainInfo.py |    1 +
 image.py          |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)


diff -Nru a/tools/python/xen/xend/XendDomainInfo.py 
b/tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   2005-06-17 21:04:11 -04:00
+++ b/tools/python/xen/xend/XendDomainInfo.py   2005-06-17 21:04:11 -04:00
@@ -716,6 +716,7 @@
                 ctrl.initController(reboot=True)
         else:
             self.create_configured_devices()
+        self.image.createDeviceModel()
 
     def device_create(self, dev_config):
         """Create a new device.
diff -Nru a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    2005-06-17 21:04:11 -04:00
+++ b/tools/python/xen/xend/image.py    2005-06-17 21:04:11 -04:00
@@ -1,4 +1,4 @@
-import os
+import os, string
 
 import xen.lowlevel.xc; xc = xen.lowlevel.xc.new()
 from xen.xend import sxp
@@ -6,6 +6,8 @@
 from xen.xend.XendLogging import log
 from xen.xend.xenstore import DBVar
 
+from xen.xend.server import channel
+
 class ImageHandler:
     """Abstract base class for image handlers.
 
@@ -303,7 +305,7 @@
                   + " -f %s" % device_config
                   + self.vncParams()
                   + " -d %d" % self.vm.getDomain()
-                  + " -p %d" % self.device_channel['port1']
+                  + " -p %d" % (int(self.device_channel.port1)-1)
                   + " -m %s" % self.vm.memory)
 
     def vncParams(self):

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog