| Message ID | 20200326170757.12344-1-kwolf@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qcow2: Remove unused fields from BDRVQcow2State | expand |
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; >
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>
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;
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(-)