Patchwork block: Remove unused s->hd in various drivers

login
register
mail settings
Submitter Kevin Wolf
Date Nov. 16, 2010, 5:56 p.m.
Message ID <1289930209-23021-1-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/71440/
State New
Headers show

Comments

Kevin Wolf - Nov. 16, 2010, 5:56 p.m.
All drivers use bs->file instead of s->hd fpr quite a while now, so it's time
to remove s->hd.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow.c  |    1 -
 block/qcow2.h |    1 -
 block/vdi.c   |    1 -
 block/vmdk.c  |    1 -
 block/vpc.c   |    2 --
 5 files changed, 0 insertions(+), 6 deletions(-)
Stefan Hajnoczi - Nov. 16, 2010, 8:29 p.m.
On Tue, Nov 16, 2010 at 5:56 PM, Kevin Wolf <kwolf@redhat.com> wrote:
> All drivers use bs->file instead of s->hd fpr quite a while now, so it's time
> to remove s->hd.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/qcow.c  |    1 -
>  block/qcow2.h |    1 -
>  block/vdi.c   |    1 -
>  block/vmdk.c  |    1 -
>  block/vpc.c   |    2 --
>  5 files changed, 0 insertions(+), 6 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Christoph Hellwig - Nov. 16, 2010, 10:36 p.m.
On Tue, Nov 16, 2010 at 06:56:49PM +0100, Kevin Wolf wrote:
> All drivers use bs->file instead of s->hd fpr quite a while now, so it's time
> to remove s->hd.

Looks good.

Patch

diff --git a/block/qcow.c b/block/qcow.c
index 9cd547d..f67d3d3 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -54,7 +54,6 @@  typedef struct QCowHeader {
 #define L2_CACHE_SIZE 16
 
 typedef struct BDRVQcowState {
-    BlockDriverState *hd;
     int cluster_bits;
     int cluster_size;
     int cluster_sectors;
diff --git a/block/qcow2.h b/block/qcow2.h
index 2d22e5e..5217bea 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -79,7 +79,6 @@  typedef struct QCowSnapshot {
 } QCowSnapshot;
 
 typedef struct BDRVQcowState {
-    BlockDriverState *hd;
     int cluster_bits;
     int cluster_size;
     int cluster_sectors;
diff --git a/block/vdi.c b/block/vdi.c
index 3b51e53..ab8f70f 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -186,7 +186,6 @@  typedef struct {
 } VdiHeader;
 
 typedef struct {
-    BlockDriverState *hd;
     /* The block map entries are little endian (even in memory). */
     uint32_t *bmap;
     /* Size of block (bytes). */
diff --git a/block/vmdk.c b/block/vmdk.c
index f505303..2298a75 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -61,7 +61,6 @@  typedef struct {
 #define L2_CACHE_SIZE 16
 
 typedef struct BDRVVmdkState {
-    BlockDriverState *hd;
     int64_t l1_table_offset;
     int64_t l1_backup_table_offset;
     uint32_t *l1_table;
diff --git a/block/vpc.c b/block/vpc.c
index 416f489..21e2a68 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -110,8 +110,6 @@  struct vhd_dyndisk_header {
 };
 
 typedef struct BDRVVPCState {
-    BlockDriverState *hd;
-
     uint8_t footer_buf[HEADER_SIZE];
     uint64_t free_data_block_offset;
     int max_table_entries;