diff options
| author | Shriram Rajagopalan <rshriram@cs.ubc.ca> | 2011-03-07 16:15:47 +0000 |
|---|---|---|
| committer | Shriram Rajagopalan <rshriram@cs.ubc.ca> | 2011-03-07 16:15:47 +0000 |
| commit | 277afb13214bc3cb19a11e1deabd69d255b29d9d (patch) | |
| tree | acc7465b6ec7cdbf4c620f8eaf9c19f0e345146d | |
| parent | e61c7eefd4f5e2d4fb6da1a3d31a3ce7af0454b5 (diff) | |
| download | xen-277afb13214bc3cb19a11e1deabd69d255b29d9d.tar.gz xen-277afb13214bc3cb19a11e1deabd69d255b29d9d.tar.bz2 xen-277afb13214bc3cb19a11e1deabd69d255b29d9d.zip | |
blktap2: fix gap in tapdisk2 disk_type numbering
Make the DISK_TYPE_* id numbering in tapdisk-disktypes.h contiguous.
Currently, id 8 is unallocated causing a null disk type entry in
tapdisk_disk_drivers array in tapdisk-disktypes.c. This causes the
function tapdisk_disktype_find() to return an error on encountering
disk types >7 (remus:, log:, etc.).
(Also applied to xen-unstable as 22987:649de04caff5.)
Signed-off-by: Shriram Rajagopalan <rshriram@cs.ubc.ca>
Acked-by: Daniel Stodden <daniel.stodden@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | tools/blktap2/drivers/tapdisk-disktype.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/blktap2/drivers/tapdisk-disktype.h b/tools/blktap2/drivers/tapdisk-disktype.h index 61adc21e55..b697eea0e0 100644 --- a/tools/blktap2/drivers/tapdisk-disktype.h +++ b/tools/blktap2/drivers/tapdisk-disktype.h @@ -37,9 +37,9 @@ #define DISK_TYPE_RAM 5 #define DISK_TYPE_QCOW 6 #define DISK_TYPE_BLOCK_CACHE 7 -#define DISK_TYPE_LOG 9 -#define DISK_TYPE_REMUS 10 -#define DISK_TYPE_VINDEX 11 +#define DISK_TYPE_LOG 8 +#define DISK_TYPE_REMUS 9 +#define DISK_TYPE_VINDEX 10 #define DISK_TYPE_NAME_MAX 32 |