block: Remove unused s->hd in various drivers

All drivers use bs->file instead of s->hd for quite a while now, so it's time
to remove s->hd.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

diff --git a/block/qcow.c b/block/qcow.c
index 9cd547dc02b3d114ff2add03c69a305eb3f8cac6..f67d3d39f261806e85d8b162ee5ad9ec617a10df 100644 (file)
--- 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 2d22e5ec4767d018fc1749e5c977ba46b2157af8..5217bea8a26e6236e5bf42105f736e47fdcef770 100644 (file)
--- 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 3b51e532c4e46223af0806b1cbb61a44fb4d74c9..ab8f70f17ed47137702d9a55077d825521f2ebb5 100644 (file)
--- 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 872aebac9bc8179217c4f32d9bf5ed0787cdc409..8fc9d67208a727cc130cea29f17683abcb2f7fb7 100644 (file)
--- 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 416f48900c17506d95199126344377d7f6acb646..21e2a6870c4a979b1fca22e71e0cd128ea86bdfd 100644 (file)
--- 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;