ia64/xen-unstable

changeset 1111:5f3bbc9b6af5

bitkeeper revision 1.739 (403a2269-JWq-jre7gx2LoYk7KxayQ)

support for weird-ass scsi controller device nodes
author smh22@tempest.cl.cam.ac.uk
date Mon Feb 23 15:55:21 2004 +0000 (2004-02-23)
parents 3ba8d5faadd2
children dbdb7faab4c9
files BitKeeper/etc/ignore xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c
line diff
     1.1 --- a/BitKeeper/etc/ignore	Mon Feb 23 14:06:27 2004 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Mon Feb 23 15:55:21 2004 +0000
     1.3 @@ -542,3 +542,4 @@ TAGS
     1.4  tools/xc/lib/xc_netbsd_build.o
     1.5  xen/arch/i386/pdb-stub.o
     1.6  xen/common/debug-linux.o
     1.7 +xen/drivers/char/serial.o
     2.1 --- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c	Mon Feb 23 14:06:27 2004 +0000
     2.2 +++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c	Mon Feb 23 15:55:21 2004 +0000
     2.3 @@ -122,20 +122,30 @@ static int xlvbd_init_device(xen_disk_t 
     2.4          goto out;
     2.5      }
     2.6  
     2.7 -    if ( is_ide )
     2.8 -    { 
     2.9 +    if ( is_ide ) {
    2.10 +
    2.11  	major_name = XLIDE_MAJOR_NAME; 
    2.12  	max_part   = XLIDE_MAX_PART;
    2.13 -    }
    2.14 -    else if ( is_scsi )
    2.15 -    { 
    2.16 +
    2.17 +    } else if ( is_scsi ) {
    2.18 +
    2.19  	major_name = XLSCSI_MAJOR_NAME;
    2.20  	max_part   = XLSCSI_MAX_PART;
    2.21 -    }
    2.22 -    else
    2.23 -    { 
    2.24 +
    2.25 +    } else if (XD_VIRTUAL(xd->info)) {
    2.26 +
    2.27  	major_name = XLVBD_MAJOR_NAME;
    2.28  	max_part   = XLVBD_MAX_PART;
    2.29 +
    2.30 +    } else { 
    2.31 +
    2.32 +        /* SMH: hmm - probably a CCISS driver or sim; assume CCISS for now */
    2.33 +	printk(KERN_ALERT "Assuming device %02x:%02x is CCISS/SCSI\n", 
    2.34 +	       major, minor);
    2.35 +	is_scsi    = 1; 
    2.36 +	major_name = "cciss"; 
    2.37 +	max_part   = XLSCSI_MAX_PART;
    2.38 +
    2.39      }
    2.40      
    2.41      partno = minor & (max_part - 1);