1.1 --- a/BitKeeper/etc/logging_ok	Wed Feb 16 02:18:52 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Wed Feb 16 13:13:29 2005 +0000
     1.3 @@ -1,6 +1,7 @@
     1.4  ach61@boulderdash.cl.cam.ac.uk
     1.5  ach61@labyrinth.cl.cam.ac.uk
     1.6  ach61@soar.cl.cam.ac.uk
     1.7 +akw27@arcadians.cl.cam.ac.uk
     1.8  akw27@boulderdash.cl.cam.ac.uk
     1.9  akw27@labyrinth.cl.cam.ac.uk
    1.10  akw27@plucky.localdomain

     2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap_datapath.c	Wed Feb 16 02:18:52 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap_datapath.c	Wed Feb 16 13:13:29 2005 +0000
     2.3 @@ -456,13 +456,18 @@ void print_vm_ring_idxs(void)
     2.4      WPRINTK("FE Rings: \n---------\n");
     2.5      for ( i = 0; i < 50; i++) { 
     2.6          blkif = blkif_find_by_handle((domid_t)i, 0);
     2.7 -        if (blkif != NULL)
     2.8 -            WPRINTK("%2d: req_cons: %2d, rsp_prod_prv: %2d "
     2.9 -                "| req_prod: %2d, rsp_prod: %2d\n", i, 
    2.10 -                blkif->blk_ring.req_cons,
    2.11 -                blkif->blk_ring.rsp_prod_pvt,
    2.12 -                blkif->blk_ring.sring->req_prod,
    2.13 -                blkif->blk_ring.sring->rsp_prod);
    2.14 +        if (blkif != NULL) {
    2.15 +            if (blkif->blk_ring.sring != NULL) {
    2.16 +                WPRINTK("%2d: req_cons: %2d, rsp_prod_prv: %2d "
    2.17 +                    "| req_prod: %2d, rsp_prod: %2d\n", i, 
    2.18 +                    blkif->blk_ring.req_cons,
    2.19 +                    blkif->blk_ring.rsp_prod_pvt,
    2.20 +                    blkif->blk_ring.sring->req_prod,
    2.21 +                    blkif->blk_ring.sring->rsp_prod);
    2.22 +            } else {
    2.23 +                WPRINTK("%2d: [no device channel yet]\n", i);
    2.24 +            }
    2.25 +        }
    2.26      }
    2.27      if (blktap_be_ring.sring != NULL) {
    2.28          WPRINTK("BE Ring: \n--------\n");