diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-03-10 17:49:21 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-03-10 17:49:21 +0000 |
| commit | 51373e7145540cfad3f262e135f4fe85a389310c (patch) | |
| tree | 81ee1cd6e749216ac85c151876b9e5d2de87cc59 | |
| parent | 8e86d6ab9f4b3995436f548b3ef6494564dfd26a (diff) | |
| parent | 1cfe7f0ac9ccd13d80df5d1ddddf1e22c63db810 (diff) | |
| download | xen-RELEASE-2.0.5.tar.gz xen-RELEASE-2.0.5.tar.bz2 xen-RELEASE-2.0.5.zip | |
bitkeeper revision 1.1159.258.41 (423088a133TZpmpxQnBtgWzoOWnK2A)RELEASE-2.0.5
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
| -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 |
2 files changed, 3 insertions, 3 deletions
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 c248f21419..61ba2d3776 100644 --- 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. */ |