ia64/xen-unstable

changeset 869:138060ee0e68

bitkeeper revision 1.542 (3f9ffd93ZnP2SPpFtxRCNkTtIUn09A)

merge o death
author smh22@labyrinth.cl.cam.ac.uk
date Wed Oct 29 17:49:07 2003 +0000 (2003-10-29)
parents d5ad00b29735 373b790a91e6
children b147d210dca8
files BitKeeper/etc/ignore xen/drivers/block/xen_block.c
line diff
     1.1 --- a/BitKeeper/etc/ignore	Wed Oct 29 17:30:14 2003 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Wed Oct 29 17:49:07 2003 +0000
     1.3 @@ -474,3 +474,8 @@ tools/misc/xen_read_console
     1.4  extras/mini-os/h/hypervisor-ifs
     1.5  xen/BLOG
     1.6  xen/drivers/block/xen_vbd.o
     1.7 +tools/internal/xi_vif_params
     1.8 +tools/misc/xen_cpuperf
     1.9 +tools/misc/xen_log
    1.10 +tools/misc/xen_refresh_dev
    1.11 +xenolinux-2.4.22-sparse/arch/xeno/drivers/block/device
     2.1 --- a/xen/drivers/block/xen_block.c	Wed Oct 29 17:30:14 2003 +0000
     2.2 +++ b/xen/drivers/block/xen_block.c	Wed Oct 29 17:49:07 2003 +0000
     2.3 @@ -583,11 +583,15 @@ static void dispatch_probe(struct task_s
     2.4      */
     2.5      xdi = map_domain_mem(buffer);
     2.6      xdi->count = 0; 
     2.7 -    /*if(IS_PRIV(p)) { */
     2.8 +#if 0 // XXX SMH: fix below once done proper vbd/physd rewrit
     2.9 +    if(IS_PRIV(p)) { 
    2.10 +#endif
    2.11  	/* privilege domains always gets access to the 'real' devices */
    2.12  	ide_probe_devices(xdi);
    2.13  	scsi_probe_devices(xdi);
    2.14 -    /*} */ 
    2.15 +#if 0
    2.16 +    } 
    2.17 +#endif
    2.18      vbd_probe_devices(xdi, p); 
    2.19      unmap_domain_mem(xdi);
    2.20