Skip to contentSkip to conversation

qcow2: Remove unused fields from BDRVQcow2State

PATCH In review Kevin Wolf 3 participants 3 messages Mar 26, 2020 Block layer

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 qcow2: Remove unused fields from BDRVQcow2State

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
---
 block/qcow2.h | 3 ---
 1 file changed, 3 deletions(-)
block/qcow2.h +0 -3
index 0942126232..f4de0a27d5 100644
@@ -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;
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Kevin Wolf

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
---
  block/qcow2.h | 3 ---
  1 file changed, 3 deletions(-)
Quoted 15 lines
block/qcow2.h +0 -3
index 0942126232..f4de0a27d5 100644
@@ -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;
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Reviewed-by on v1 1/1
#2 lore raw
In reply to Kevin Wolf
Quoted 16 lines · Kevin Wolf

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
---
  block/qcow2.h | 3 ---
  1 file changed, 3 deletions(-)
block/qcow2.h +0 -0
index 0942126232..f4de0a27d5 100644

block/qcow2.h typedef struct BDRVQcow2State { · line 306

Quoted 9 lines
block/qcow2.h +0 -3
@@ -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;