qcow2: Remove unused fields from BDRVQcow2State

[PATCH] qcow2: Remove unused fields from BDRVQcow2State

Posted by Kevin Wolf 5 years, 7 months ago

These fields were already removed in commit c3c10f72, but then commit
b58deb34 revived them probably due to bad merge conflict resolution.
They are still unused, so remove them again.

Fixes: b58deb344ddff3b9d8b265bf73a65274767ee5f4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/block/qcow2.h b/block/qcow2.h
index 0942126232..f4de0a27d5 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -301,9 +301,6 @@ typedef struct BDRVQcow2State {
     QEMUTimer *cache_clean_timer;
     unsigned cache_clean_interval;
 
-    uint8_t *cluster_cache;
-    uint8_t *cluster_data;
-    uint64_t cluster_cache_offset;
     QLIST_HEAD(, QCowL2Meta) cluster_allocs;
 
     uint64_t *refcount_table;
-- 
2.20.1

Re: [PATCH] qcow2: Remove unused fields from BDRVQcow2State

Posted by Eric Blake 5 years, 7 months ago

On 3/26/20 12:07 PM, Kevin Wolf wrote:
> These fields were already removed in commit c3c10f72, but then commit
> b58deb34 revived them probably due to bad merge conflict resolution.
> They are still unused, so remove them again.
> 
> Fixes: b58deb344ddff3b9d8b265bf73a65274767ee5f4
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>   block/qcow2.h | 3 ---
>   1 file changed, 3 deletions(-)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

> diff --git a/block/qcow2.h b/block/qcow2.h
> index 0942126232..f4de0a27d5 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -301,9 +301,6 @@ typedef struct BDRVQcow2State {
>       QEMUTimer *cache_clean_timer;
>       unsigned cache_clean_interval;
>   
> -    uint8_t *cluster_cache;
> -    uint8_t *cluster_data;
> -    uint64_t cluster_cache_offset;
>       QLIST_HEAD(, QCowL2Meta) cluster_allocs;
>   
>       uint64_t *refcount_table;
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Re: [PATCH] qcow2: Remove unused fields from BDRVQcow2State

Posted by Philippe Mathieu-Daudé 5 years, 7 months ago

On 3/26/20 6:07 PM, Kevin Wolf wrote:
> These fields were already removed in commit c3c10f72, but then commit
> b58deb34 revived them probably due to bad merge conflict resolution.
> They are still unused, so remove them again.
> 
> Fixes: b58deb344ddff3b9d8b265bf73a65274767ee5f4
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>   block/qcow2.h | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/block/qcow2.h b/block/qcow2.h
> index 0942126232..f4de0a27d5 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -301,9 +301,6 @@ typedef struct BDRVQcow2State {
>       QEMUTimer *cache_clean_timer;
>       unsigned cache_clean_interval;
>   
> -    uint8_t *cluster_cache;
> -    uint8_t *cluster_data;
> -    uint64_t cluster_cache_offset;
>       QLIST_HEAD(, QCowL2Meta) cluster_allocs;
>   
>       uint64_t *refcount_table;
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>