diff options
Diffstat (limited to 'tools/blktap/drivers/tapdisk.h')
| -rw-r--r-- | tools/blktap/drivers/tapdisk.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/blktap/drivers/tapdisk.h b/tools/blktap/drivers/tapdisk.h index 1f03156456..813c05ebe3 100644 --- a/tools/blktap/drivers/tapdisk.h +++ b/tools/blktap/drivers/tapdisk.h @@ -61,7 +61,6 @@ /* Things disks need to know about, these should probably be in a higher-level * header. */ -#define MAX_REQUESTS 64 #define MAX_SEGMENTS_PER_REQ 11 #define SECTOR_SHIFT 9 #define DEFAULT_SECTOR_SIZE 512 @@ -75,9 +74,9 @@ struct td_state { void *ring_info; void *fd_entry; char backing_file[1024]; /*Used by differencing disks, e.g. qcow*/ - long int sector_size; - uint64_t size; - long int info; + unsigned long sector_size; + unsigned long long size; + unsigned int info; }; /* Prototype of the callback to activate as requests complete. */ @@ -191,9 +190,8 @@ static disk_info_t *dtypes[] = { }; typedef struct driver_list_entry { - void *blkif; - void *prev; - void *next; + struct blkif *blkif; + struct driver_list_entry **pprev, *next; } driver_list_entry_t; typedef struct fd_list_entry { @@ -201,8 +199,7 @@ typedef struct fd_list_entry { int tap_fd; int io_fd[MAX_IOFD]; struct td_state *s; - void *prev; - void *next; + struct fd_list_entry **pprev, *next; } fd_list_entry_t; int qcow_create(const char *filename, uint64_t total_size, |