New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com)
You can review this change at:
http://gerrit.usersys.redhat.com/877
commit a547ab95725ebfe9f2f9365eeae3e1543b366d2f
Author: Eduardo Warszawski <ewarszaw(a)redhat.com>
Date: Mon Aug 29 19:20:44 2011 +0300
Related to BZ#732416 - Remove unused idle param in volume.qemuConvert()
Change-Id: Ib11545298238d40795f098d60bc14e3d10ac7677
diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py
index 8e86fdc..5c6b114 100644
--- a/vdsm/storage/image.py
+++ b/vdsm/storage/image.py
@@ -803,7 +803,7 @@ class Image:
try:
(rc, out, err) = volume.qemuConvert(volParams['path'],
dstPath,
- volParams['volFormat'], dstVolFormat, self.idle,
vars.task.aborting,
+ volParams['volFormat'], dstVolFormat,
vars.task.aborting,
size=srcVol.getVolumeSize(bs=1), dstvolType=dstVol.getType())
if rc:
raise se.StorageException("rc: %s, err: %s" % (rc,
err))
@@ -1053,7 +1053,7 @@ class Image:
# Step 2: Convert successor to new volume
# qemu-img convert -f qcow2 successor -O raw newUUID
(rc, out, err) = volume.qemuConvert(srcVolParams['path'],
newVol.getVolumePath(),
- srcVolParams['volFormat'], volParams['volFormat'], self.idle,
vars.task.aborting,
+ srcVolParams['volFormat'], volParams['volFormat'],
vars.task.aborting,
size=volParams['apparentsize'], dstvolType=newVol.getType())
if rc:
raise se.MergeSnapshotsError(newUUID)
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index aa3f4ae..7dce885 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -921,7 +921,7 @@ def qemuRebase(src, srcFormat, backingFile, backingFormat, unsafe,
idle, stop, r
return (rc, out, err)
-def qemuConvert(src, dst, src_fmt, dst_fmt, idle, stop, size, dstvolType):
+def qemuConvert(src, dst, src_fmt, dst_fmt, stop, size, dstvolType):
"""
Convert the 'src' image (or chain of images) into a new single 'dst'
"""