bitkeeper revision 1.1159.267.1 (42308892nDLBoNRoKA_URBGXNhvEUg)

Change blkif_pdev_t to u32 to allow configuring backend devices which
use 32-bit numbers to identify devices.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

diff --git a/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c b/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c
index b530128366cc8fc89502dc4283a7eb75758d874a..1aa5acf0c9c7270b0f747827f93c65ced1d1150b 100644 (file)
--- a/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c
+++ b/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c
@@ -129,7 +129,8 @@ void vbd_grow(blkif_be_vbd_grow_t *grow)
         return;
     }
 
-    x->extent.device        = grow->extent.device;
+    /* Mask to 16-bit for compatibility with old tools */
+    x->extent.device        = grow->extent.device & 0xffff;
     x->extent.sector_start  = grow->extent.sector_start;
     x->extent.sector_length = grow->extent.sector_length;
     x->next                 = (blkif_extent_le_t *)NULL;

diff --git a/xen/include/public/io/domain_controller.h b/xen/include/public/io/domain_controller.h
index c248f21419e730f96459513231d96ec4fc4a0cce..61ba2d3776b69cafeb9cd6e0f58c90567e07db5a 100644 (file)
--- a/xen/include/public/io/domain_controller.h
+++ b/xen/include/public/io/domain_controller.h
@@ -81,7 +81,7 @@ typedef struct {
 
 /* These are used by both front-end and back-end drivers. */
 #define blkif_vdev_t   u16
-#define blkif_pdev_t   u16
+#define blkif_pdev_t   u32
 #define blkif_sector_t u64
 
 /*
@@ -183,7 +183,6 @@ typedef struct {
     blkif_sector_t sector_start;   /*  0 */
     blkif_sector_t sector_length;  /*  8 */
     blkif_pdev_t   device;         /* 16 */
-    u16            __pad;          /* 18 */
 } PACKED blkif_extent_t; /* 20 bytes */
 
 /* Non-specific 'okay' return. */