Change in vdsm[master]: vdsm: Remove dead code in MigrationSourceThread.run
mbetak at redhat.com
mbetak at redhat.com
Tue Aug 20 15:07:01 UTC 2013
Martin Betak has uploaded a new change for review.
Change subject: vdsm: Remove dead code in MigrationSourceThread.run
......................................................................
vdsm: Remove dead code in MigrationSourceThread.run
Removed the mstate variable and the corresponding if as the
variable was not used otherwise and the condition always true.
Change-Id: Ie507413f07eed5e8c0958b74ae2103d11dd1e0f3
Signed-off-by: Martin Betak <mbetak at redhat.com>
---
M vdsm/vm.py
1 file changed, 8 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/18336/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 4f80b4c..e064f97 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -291,22 +291,20 @@
def run(self):
try:
- mstate = ''
self._setupVdsConnection()
self._setupRemoteMachineParams()
self._prepareGuest()
MigrationSourceThread._ongoingMigrations.acquire()
try:
self.log.debug("migration semaphore acquired")
- if not mstate:
- self._vm.conf['_migrationParams'] = {
- 'dst': self._dst,
- 'mode': self._mode,
- 'method': self._method,
- 'dstparams': self._dstparams,
- 'dstqemu': self._dstqemu}
- self._vm.saveState()
- self._startUnderlyingMigration()
+ self._vm.conf['_migrationParams'] = {
+ 'dst': self._dst,
+ 'mode': self._mode,
+ 'method': self._method,
+ 'dstparams': self._dstparams,
+ 'dstqemu': self._dstqemu}
+ self._vm.saveState()
+ self._startUnderlyingMigration()
self._finishSuccessfully()
except libvirt.libvirtError as e:
if e.get_error_code() == libvirt.VIR_ERR_OPERATION_ABORTED:
--
To view, visit http://gerrit.ovirt.org/18336
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie507413f07eed5e8c0958b74ae2103d11dd1e0f3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Betak <mbetak at redhat.com>
More information about the vdsm-patches
mailing list