aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap2
diff options
context:
space:
mode:
authorShriram Rajagopalan <rshriram@cs.ubc.ca>2011-03-07 16:15:15 +0000
committerShriram Rajagopalan <rshriram@cs.ubc.ca>2011-03-07 16:15:15 +0000
commit2df00194351ac0e59dd8a3800ae350622ff4af80 (patch)
treedc25a5291ea86d0327fedc644b8b7d4419efe083 /tools/blktap2
parente4cdd74f02eaeea96348dc51534eff8e03d87697 (diff)
downloadxen-2df00194351ac0e59dd8a3800ae350622ff4af80.tar.gz
xen-2df00194351ac0e59dd8a3800ae350622ff4af80.tar.bz2
xen-2df00194351ac0e59dd8a3800ae350622ff4af80.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.). 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>
Diffstat (limited to 'tools/blktap2')
-rw-r--r--tools/blktap2/drivers/tapdisk-disktype.h6
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