summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-11-16 18:55:01 +0100
committerKevin Wolf <kwolf@redhat.com>2010-11-24 17:31:06 +0100
commit80465c5016f23d8b39efb36db2ca77a35f67eaef (patch)
tree95393f97cb3399f0052b0acefba2f8108d65d4f2
parent5cbdebe39e08caf5a373ef1c03a0292d5af955ce (diff)
downloadqemu-80465c5016f23d8b39efb36db2ca77a35f67eaef.tar.gz
qemu-80465c5016f23d8b39efb36db2ca77a35f67eaef.tar.bz2
qemu-80465c5016f23d8b39efb36db2ca77a35f67eaef.zip
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>
-rw-r--r--block/qcow.c1
-rw-r--r--block/qcow2.h1
-rw-r--r--block/vdi.c1
-rw-r--r--block/vmdk.c1
-rw-r--r--block/vpc.c2
5 files changed, 0 insertions, 6 deletions
diff --git a/block/qcow.c b/block/qcow.c
index 9cd547dc02..f67d3d39f2 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 2d22e5ec47..5217bea8a2 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 3b51e532c4..ab8f70f17e 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 872aebac9b..8fc9d67208 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 416f48900c..21e2a6870c 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;