You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by mr...@apache.org on 2009/04/03 20:40:54 UTC
svn commit: r761785 -
/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
Author: mryan3
Date: Fri Apr 3 20:40:54 2009
New Revision: 761785
URL: http://svn.apache.org/viewvc?rev=761785&view=rev
Log:
Modified the interface used on the qemu console to do migrations because qemu has changed the format.
Modified:
incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py?rev=761785&r1=761784&r2=761785&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py Fri Apr 3 20:40:54 2009
@@ -417,7 +417,7 @@
port = int(random.random()*1000+19000)
self.usedPorts.append(port)
self.usedPortsLock.release()
- (vmId, cmd) = self.startVm(instance, "tcp://0.0.0.0:%d" % (port))
+ (vmId, cmd) = self.startVm(instance, "tcp:0.0.0.0:%d" % (port))
transportCookie = cPickle.dumps((port, vmId, socket.gethostname()))
child = self.getChildFromPid(vmId)
child.cmd = cmd
@@ -440,7 +440,7 @@
(port, _vmId, _hostname) = cPickle.loads(transportCookie)
child = self.getChildFromPid(vmId)
child.migratingOut = True
- res = self.stopVm(vmId, "tcp://%s:%d" % (target, port), False)
+ res = self.stopVm(vmId, "tcp:%s:%d" % (target, port), False)
# XXX: Some sort of feedback would be nice
# XXX: Should we block?
self.waitForExit(vmId)