diff options
author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-03-10 18:15:14 +0000 |
---|---|---|
committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-03-10 18:15:14 +0000 |
commit | dac8c36dc59c9d6e2c6c3ea70ce692cfe0349154 (patch) | |
tree | 5c4b5559777e596bdd2ebb67c90bf921792ca53c | |
parent | d4b811cf376016e21cf696fda70130321729aa18 (diff) | |
parent | ccb808be8ea97f9d25370c9f1bd11aba2076fae2 (diff) | |
download | xen-dac8c36dc59c9d6e2c6c3ea70ce692cfe0349154.tar.gz xen-dac8c36dc59c9d6e2c6c3ea70ce692cfe0349154.tar.bz2 xen-dac8c36dc59c9d6e2c6c3ea70ce692cfe0349154.zip |
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
-rw-r--r-- | .hgtags | 1 | ||||
-rw-r--r-- | linux-2.6.10-xen-sparse/drivers/xen/blkback/vbd.c | 3 | ||||
-rw-r--r-- | xen/include/public/io/domain_controller.h | 3 |
3 files changed, 4 insertions, 3 deletions
@@ -3,6 +3,7 @@ dc2f08429f17e6614fd2f1ab88cc09ca0a850f32 RELEASE-2.0.2 6e1bbc13911751efa0b1c018425c1b085820fa02 RELEASE-2.0.3 fb875591fd72e15c31879c0e9034d99b80225595 RELEASE-2.0.4 +1a522944f76540ea9d73fcc1b0d13d0f670183f0 RELEASE-2.0.5 487b2ee37d1cecb5f3e7a546b05ad097a0226f2f beta1 3d330e41f41ce1bc118c02346e18949ad5d67f6b latest-semistable 30c521db4c71960b0cf1d9c9e1b658e77b535a3e latest-stable 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 b530128366..1aa5acf0c9 100644 --- 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 5742e58e40..b3220eee1c 100644 --- a/xen/include/public/io/domain_controller.h +++ b/xen/include/public/io/domain_controller.h @@ -91,7 +91,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 /* @@ -193,7 +193,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. */ |