qcow2: remove QCowL2Meta parameter from handle_copied

[PATCH] qcow2: remove QCowL2Meta parameter from handle_copied

Posted by Yi Li 5 years, 8 months ago

The QCowL2Meta **m parameter is not used

Signed-off-by: Yi Li <yili@winhong.com>
---
 block/qcow2-cluster.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 17f1363..db9efa5 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1154,7 +1154,7 @@ static int handle_dependencies(BlockDriverState *bs, uint64_t guest_offset,
  *  -errno: in error cases
  */
 static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
-    uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
+    uint64_t *host_offset, uint64_t *bytes)
 {
     BDRVQcow2State *s = bs->opaque;
     int l2_index;
@@ -1567,7 +1567,7 @@ again:
         /*
          * 2. Count contiguous COPIED clusters.
          */
-        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes, m);
+        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes);
         if (ret < 0) {
             return ret;
         } else if (ret) {
-- 
2.7.5

Re: [PATCH] qcow2: remove QCowL2Meta parameter from handle_copied

Posted by John Snow 5 years, 8 months ago

CC qemu-block and qcow2 maintainers

(Use scripts/get_maintainer.pl to identify maintainers.)

On 3/9/20 12:35 PM, Yi Li wrote:
> The QCowL2Meta **m parameter is not used
> 
> Signed-off-by: Yi Li <yili@winhong.com>
> ---
>  block/qcow2-cluster.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
> index 17f1363..db9efa5 100644
> --- a/block/qcow2-cluster.c
> +++ b/block/qcow2-cluster.c
> @@ -1154,7 +1154,7 @@ static int handle_dependencies(BlockDriverState *bs, uint64_t guest_offset,
>   *  -errno: in error cases
>   */
>  static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
> -    uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
> +    uint64_t *host_offset, uint64_t *bytes)
>  {
>      BDRVQcow2State *s = bs->opaque;
>      int l2_index;
> @@ -1567,7 +1567,7 @@ again:
>          /*
>           * 2. Count contiguous COPIED clusters.
>           */
> -        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes, m);
> +        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes);
>          if (ret < 0) {
>              return ret;
>          } else if (ret) {
> 

Seems OK to me -- it is definitely unused.
(Is _that_ a problem?  For qcow2 maintainers to know.)

Reviewed-by: John Snow <jsnow@redhat.com>

Re: [PATCH] qcow2: remove QCowL2Meta parameter from handle_copied

Posted by Alberto Garcia 5 years, 8 months ago

On Tue 10 Mar 2020 03:04:47 AM CET, John Snow wrote:
>>  static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
>> -    uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
>> +    uint64_t *host_offset, uint64_t *bytes)
>>  {
>>      BDRVQcow2State *s = bs->opaque;
>>      int l2_index;
>> @@ -1567,7 +1567,7 @@ again:
>>          /*
>>           * 2. Count contiguous COPIED clusters.
>>           */
>> -        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes, m);
>> +        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes);
>>          if (ret < 0) {
>>              return ret;
>>          } else if (ret) {
>> 
>
> Seems OK to me -- it is definitely unused.
> (Is _that_ a problem?  For qcow2 maintainers to know.)

It is unused now, but I'm using it in my subcluster allocation patches:

   https://lists.gnu.org/archive/html/qemu-block/2019-12/msg00588.html

(I expect to send v4 soon, probably this week)

Berto

Re: [PATCH] qcow2: remove QCowL2Meta parameter from handle_copied

Posted by John Snow 5 years, 8 months ago


On 3/10/20 7:19 AM, Alberto Garcia wrote:
> On Tue 10 Mar 2020 03:04:47 AM CET, John Snow wrote:
>>>  static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
>>> -    uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
>>> +    uint64_t *host_offset, uint64_t *bytes)
>>>  {
>>>      BDRVQcow2State *s = bs->opaque;
>>>      int l2_index;
>>> @@ -1567,7 +1567,7 @@ again:
>>>          /*
>>>           * 2. Count contiguous COPIED clusters.
>>>           */
>>> -        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes, m);
>>> +        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes);
>>>          if (ret < 0) {
>>>              return ret;
>>>          } else if (ret) {
>>>
>>
>> Seems OK to me -- it is definitely unused.
>> (Is _that_ a problem?  For qcow2 maintainers to know.)
> 
> It is unused now, but I'm using it in my subcluster allocation patches:
> 
>    https://lists.gnu.org/archive/html/qemu-block/2019-12/msg00588.html
> 
> (I expect to send v4 soon, probably this week)
> 
> Berto
> 

I had a hunch.

Thanks!