[Xen-changelog] [xen-4.1-testing] blktap2: fix gap in tapdisk2 disk_type numbering

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Shriram Rajagopalan <rshriram@xxxxxxxxx>
# Date 1299514547 0
# Node ID 1f5818838aa6a028590d42f8dcad12247339db9c
# Parent  0f9f2248127e91ae95ca9b8b9b2db17ad0719bcb
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@xxxxxxxxx>
Acked-by: Daniel Stodden <daniel.stodden@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 0f9f2248127e -r 1f5818838aa6 tools/blktap2/drivers/tapdisk-disktype.h
--- a/tools/blktap2/drivers/tapdisk-disktype.h  Sat Mar 05 16:05:52 2011 +0000
+++ b/tools/blktap2/drivers/tapdisk-disktype.h  Mon Mar 07 16:15:47 2011 +0000
@@ -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
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog