diff options
Diffstat (limited to 'xen/drivers/block')
-rw-r--r-- | xen/drivers/block/xen_block.c | 20 | ||||
-rw-r--r-- | xen/drivers/block/xen_segment.c | 12 |
2 files changed, 7 insertions, 25 deletions
diff --git a/xen/drivers/block/xen_block.c b/xen/drivers/block/xen_block.c index bf9cfd7431..a49817d46f 100644 --- a/xen/drivers/block/xen_block.c +++ b/xen/drivers/block/xen_block.c @@ -17,10 +17,8 @@ #include <xeno/keyhandler.h> #include <xeno/interrupt.h> #include <xeno/segment.h> -#include <asm/domain_page.h> /* TEST_READ_VALIDITY */ -#if 1 -#define TEST_READ_VALIDITY +#if 0 #define DPRINTK(_f, _a...) printk( _f , ## _a ) #else #define DPRINTK(_f, _a...) ((void)0) @@ -206,16 +204,6 @@ static void end_block_io_op(struct buffer_head *bh, int uptodate) DPRINTK("Buffer not up-to-date at end of operation\n"); pending_req->status = 1; } -#ifdef TEST_READ_VALIDITY - else if ( pending_req->operation == READ ) - { - unsigned long *buff = map_domain_mem(virt_to_phys(bh->b_data)); - if ( (buff[ 0] == 0xdeadbeef) && - (buff[127] == 0xdeadbeef) ) - printk("An unmodified buffer at sector %ld\n", bh->b_rsector); - unmap_domain_mem(buff); - } -#endif unlock_buffer(pending_req->domain, virt_to_phys(bh->b_data), @@ -616,12 +604,6 @@ static void dispatch_rw_block_io(struct task_struct *p, int index) } else { -#ifdef TEST_READ_VALIDITY - unsigned long *buff = map_domain_mem(phys_seg[i].buffer); - buff[ 0] = 0xdeadbeef; - buff[127] = 0xdeadbeef; - unmap_domain_mem(buff); -#endif bh->b_state = (1 << BH_Mapped) | (1 << BH_Read); } diff --git a/xen/drivers/block/xen_segment.c b/xen/drivers/block/xen_segment.c index 4a09f511a6..dbfe699030 100644 --- a/xen/drivers/block/xen_segment.c +++ b/xen/drivers/block/xen_segment.c @@ -101,6 +101,7 @@ void xen_segment_probe(struct task_struct *p, xen_disk_info_t *raw_xdi) { int loop, i; xen_disk_info_t *xdi = map_domain_mem(virt_to_phys(raw_xdi)); + unsigned long capacity = 0, device; for ( loop = 0; loop < XEN_MAX_SEGMENTS; loop++ ) { @@ -108,13 +109,12 @@ void xen_segment_probe(struct task_struct *p, xen_disk_info_t *raw_xdi) (xsegments[loop].domain != p->domain) ) continue; - xdi->disks[xdi->count].device = - MK_VIRTUAL_XENDEV(xsegments[loop].segment_number); + device = MK_VIRTUAL_XENDEV(xsegments[loop].segment_number); for ( i = 0; i < xsegments[loop].num_extents; i++ ) - { - xdi->disks[xdi->count].capacity += - xsegments[loop].extents[i].size; - } + capacity += xsegments[loop].extents[i].size; + + xdi->disks[xdi->count].device = device; + xdi->disks[xdi->count].capacity = capacity; xdi->count++; } |