ia64/xen-unstable

changeset 4085:88387fe58b12

bitkeeper revision 1.1236.25.2 (42308eb24QS1I9sZRsloBYf2N3-6vA)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Thu Mar 10 18:15:14 2005 +0000 (2005-03-10)
parents ac47854d261f b8af04b0a34c
children 8b210df9a21a 00c3e9ce38eb
files .hgtags linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c xen/include/public/io/domain_controller.h
line diff
     1.1 --- a/.hgtags	Thu Mar 10 17:41:37 2005 +0000
     1.2 +++ b/.hgtags	Thu Mar 10 18:15:14 2005 +0000
     1.3 @@ -3,6 +3,7 @@ 475a162b66e2c19b1e9468b234a4ba705334905e
     1.4  dc2f08429f17e6614fd2f1ab88cc09ca0a850f32 RELEASE-2.0.2
     1.5  6e1bbc13911751efa0b1c018425c1b085820fa02 RELEASE-2.0.3
     1.6  fb875591fd72e15c31879c0e9034d99b80225595 RELEASE-2.0.4
     1.7 +1a522944f76540ea9d73fcc1b0d13d0f670183f0 RELEASE-2.0.5
     1.8  487b2ee37d1cecb5f3e7a546b05ad097a0226f2f beta1
     1.9  3d330e41f41ce1bc118c02346e18949ad5d67f6b latest-semistable
    1.10  30c521db4c71960b0cf1d9c9e1b658e77b535a3e latest-stable
     2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c	Thu Mar 10 17:41:37 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c	Thu Mar 10 18:15:14 2005 +0000
     2.3 @@ -129,7 +129,8 @@ void vbd_grow(blkif_be_vbd_grow_t *grow)
     2.4          return;
     2.5      }
     2.6  
     2.7 -    x->extent.device        = grow->extent.device;
     2.8 +    /* Mask to 16-bit for compatibility with old tools */
     2.9 +    x->extent.device        = grow->extent.device & 0xffff;
    2.10      x->extent.sector_start  = grow->extent.sector_start;
    2.11      x->extent.sector_length = grow->extent.sector_length;
    2.12      x->next                 = (blkif_extent_le_t *)NULL;
     3.1 --- a/xen/include/public/io/domain_controller.h	Thu Mar 10 17:41:37 2005 +0000
     3.2 +++ b/xen/include/public/io/domain_controller.h	Thu Mar 10 18:15:14 2005 +0000
     3.3 @@ -91,7 +91,7 @@ typedef struct {
     3.4  
     3.5  /* These are used by both front-end and back-end drivers. */
     3.6  #define blkif_vdev_t   u16
     3.7 -#define blkif_pdev_t   u16
     3.8 +#define blkif_pdev_t   u32
     3.9  #define blkif_sector_t u64
    3.10  
    3.11  /*
    3.12 @@ -193,7 +193,6 @@ typedef struct {
    3.13      blkif_sector_t sector_start;   /*  0 */
    3.14      blkif_sector_t sector_length;  /*  8 */
    3.15      blkif_pdev_t   device;         /* 16 */
    3.16 -    u16            __pad;          /* 18 */
    3.17  } PACKED blkif_extent_t; /* 20 bytes */
    3.18  
    3.19  /* Non-specific 'okay' return. */