From 2df00194351ac0e59dd8a3800ae350622ff4af80 Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Mon, 7 Mar 2011 16:15:15 +0000 Subject: 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 Acked-by: Daniel Stodden Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/blktap2/drivers/tapdisk-disktype.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/blktap2') 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 -- cgit v1.2.3