ia64/xen-unstable
changeset 4086:8b210df9a21a
bitkeeper revision 1.1236.1.77 (4230c58f-iyInAO4A8-wn4Dad3ay-g)
Merge ssh://srg//auto/groups/xeno/BK/xeno.bk
into equilibrium.research:/export/scratch/xeno-usbfixes.bk
Merge ssh://srg//auto/groups/xeno/BK/xeno.bk
into equilibrium.research:/export/scratch/xeno-usbfixes.bk
author | mwilli2@equilibrium.research |
---|---|
date | Thu Mar 10 22:09:19 2005 +0000 (2005-03-10) |
parents | c5afd0448d79 88387fe58b12 |
children | f234096eb41e |
files | .hgtags install.sh 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 16:19:06 2005 +0000 1.2 +++ b/.hgtags Thu Mar 10 22:09:19 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/install.sh Thu Mar 10 16:19:06 2005 +0000 2.2 +++ b/install.sh Thu Mar 10 22:09:19 2005 +0000 2.3 @@ -33,6 +33,8 @@ do 2.4 done 2.5 cd - 2.6 cp -fdR $src/* $dst 2.7 +# hack to fixup the case that init.d is a symlink 2.8 +cp -fdR $src/etc/init.d/* $dst/etc/init.d/ 2.9 echo "All done." 2.10 2.11 echo "Checking to see whether prerequisite tools are installed..."
3.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c Thu Mar 10 16:19:06 2005 +0000 3.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c Thu Mar 10 22:09:19 2005 +0000 3.3 @@ -129,7 +129,8 @@ void vbd_grow(blkif_be_vbd_grow_t *grow) 3.4 return; 3.5 } 3.6 3.7 - x->extent.device = grow->extent.device; 3.8 + /* Mask to 16-bit for compatibility with old tools */ 3.9 + x->extent.device = grow->extent.device & 0xffff; 3.10 x->extent.sector_start = grow->extent.sector_start; 3.11 x->extent.sector_length = grow->extent.sector_length; 3.12 x->next = (blkif_extent_le_t *)NULL;
4.1 --- a/xen/include/public/io/domain_controller.h Thu Mar 10 16:19:06 2005 +0000 4.2 +++ b/xen/include/public/io/domain_controller.h Thu Mar 10 22:09:19 2005 +0000 4.3 @@ -91,7 +91,7 @@ typedef struct { 4.4 4.5 /* These are used by both front-end and back-end drivers. */ 4.6 #define blkif_vdev_t u16 4.7 -#define blkif_pdev_t u16 4.8 +#define blkif_pdev_t u32 4.9 #define blkif_sector_t u64 4.10 4.11 /* 4.12 @@ -193,7 +193,6 @@ typedef struct { 4.13 blkif_sector_t sector_start; /* 0 */ 4.14 blkif_sector_t sector_length; /* 8 */ 4.15 blkif_pdev_t device; /* 16 */ 4.16 - u16 __pad; /* 18 */ 4.17 } PACKED blkif_extent_t; /* 20 bytes */ 4.18 4.19 /* Non-specific 'okay' return. */