[NEW PATCH] Related to BZ#732416 - Remove idle param in volume.qemuRebase() (via gerrit-bot)

Dan Kenigsberg danken at redhat.com
Sun Sep 11 09:44:09 UTC 2011


New patch submitted by Dan Kenigsberg (danken at redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/878

commit b7a87754e039ff71ab5a3e5d795d50331abce13d
Author: Eduardo Warszawski <ewarszaw at redhat.com>
Date:   Mon Aug 29 19:30:41 2011 +0300

    Related to BZ#732416 - Remove idle param in volume.qemuRebase()
    
    Change-Id: I54f1f6c86250b1723093a43252baefd4308cfbfa

diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index 7dce885..50850fa 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -173,9 +173,9 @@ class Volume:
 
             try:
                 (rc, out, err) = qemuRebase(vol.getVolumePath(), vol.getFormat(),
-                                               os.path.join('..', srcImg, srcParent),
-                                               int(dstFormat), misc.parseBool(unsafe),
-                                               vol.idle, vars.task.aborting, False)
+                                            os.path.join('..', srcImg, srcParent),
+                                            int(dstFormat), misc.parseBool(unsafe),
+                                            vars.task.aborting, False)
                 if rc:
                     raise se.MergeVolumeRollbackError(srcVol)
 
@@ -205,7 +205,7 @@ class Volume:
                  str(pvol.getFormat()), pvol.volUUID, str(True)]))
 
         (rc, out, err) = qemuRebase(self.getVolumePath(), self.getFormat(), backingVolPath,
-                                    backingFormat, unsafe, self.idle, vars.task.aborting, rollback)
+                                    backingFormat, unsafe, vars.task.aborting, rollback)
         if rc:
             raise se.MergeSnapshotsError(self.volUUID)
         self.setParent(backingVol)
@@ -895,7 +895,7 @@ def qemuCommit(src, fmt, idle, stop):
     log.debug('(qemuCommit): MERGE %s DONE' % (src))
     return (rc, out, err)
 
-def qemuRebase(src, srcFormat, backingFile, backingFormat, unsafe, idle, stop, rollback):
+def qemuRebase(src, srcFormat, backingFile, backingFormat, unsafe, stop, rollback):
     """
     Rebase the 'src' volume on top of the new 'backingFile' with new 'backingFormat'
     """




More information about the vdsm-patches mailing list