ia64/xen-unstable

changeset 4082:1a522944f765 RELEASE-2.0.5

bitkeeper revision 1.1159.258.41 (423088a133TZpmpxQnBtgWzoOWnK2A)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk
author cl349@firebug.cl.cam.ac.uk
date Thu Mar 10 17:49:21 2005 +0000 (2005-03-10)
parents 7dcf99744644 ab082fa60352
children b8af04b0a34c
files linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c xen/include/public/io/domain_controller.h
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c	Thu Mar 10 17:37:10 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c	Thu Mar 10 17:49:21 2005 +0000
     1.3 @@ -129,7 +129,8 @@ void vbd_grow(blkif_be_vbd_grow_t *grow)
     1.4          return;
     1.5      }
     1.6  
     1.7 -    x->extent.device        = grow->extent.device;
     1.8 +    /* Mask to 16-bit for compatibility with old tools */
     1.9 +    x->extent.device        = grow->extent.device & 0xffff;
    1.10      x->extent.sector_start  = grow->extent.sector_start;
    1.11      x->extent.sector_length = grow->extent.sector_length;
    1.12      x->next                 = (blkif_extent_le_t *)NULL;
     2.1 --- a/xen/include/public/io/domain_controller.h	Thu Mar 10 17:37:10 2005 +0000
     2.2 +++ b/xen/include/public/io/domain_controller.h	Thu Mar 10 17:49:21 2005 +0000
     2.3 @@ -81,7 +81,7 @@ typedef struct {
     2.4  
     2.5  /* These are used by both front-end and back-end drivers. */
     2.6  #define blkif_vdev_t   u16
     2.7 -#define blkif_pdev_t   u16
     2.8 +#define blkif_pdev_t   u32
     2.9  #define blkif_sector_t u64
    2.10  
    2.11  /*
    2.12 @@ -183,7 +183,6 @@ typedef struct {
    2.13      blkif_sector_t sector_start;   /*  0 */
    2.14      blkif_sector_t sector_length;  /*  8 */
    2.15      blkif_pdev_t   device;         /* 16 */
    2.16 -    u16            __pad;          /* 18 */
    2.17  } PACKED blkif_extent_t; /* 20 bytes */
    2.18  
    2.19  /* Non-specific 'okay' return. */