svn commit: r260566 - head/sys/dev/virtio/scsi

[Nathan Whitehorn]

This looks like it is uses a two-level set of hierarchical LUNs. Does
REPORT_LUNS not work? The new extended LUN support in CAM should be able
to handle this kind of thing now without virtio knowing anything about it.
-Nathan

On 01/12/14 12:40, Bryan Venteicher wrote:
> Author: bryanv
> Date: Sun Jan 12 17:40:47 2014
> New Revision: 260566
> URL: http://svnweb.freebsd.org/changeset/base/260566
>
> Log:
>   Remove incorrect bit shift when assigning the LUN request field
>   
>   This caused duplicate targets appearing on Google Compute Engine
>   instances.
>   
>   PR:		kern/185626
>   Submitted by:	Venkatesh Srinivas <venkateshs at google.com>
>   MFC after:	3 days
>
> Modified:
>   head/sys/dev/virtio/scsi/virtio_scsi.c
>
> Modified: head/sys/dev/virtio/scsi/virtio_scsi.c
> ==============================================================================
> --- head/sys/dev/virtio/scsi/virtio_scsi.c	Sun Jan 12 15:35:03 2014	(r260565)
> +++ head/sys/dev/virtio/scsi/virtio_scsi.c	Sun Jan 12 17:40:47 2014	(r260566)
> @@ -1539,7 +1539,7 @@ vtscsi_set_request_lun(struct ccb_hdr *c
>  	lun[0] = 1;
>  	lun[1] = ccbh->target_id;
>  	lun[2] = 0x40 | ((ccbh->target_lun >> 8) & 0x3F);
> -	lun[3] = (ccbh->target_lun >> 8) & 0xFF;
> +	lun[3] = ccbh->target_lun & 0xFF;
>  }
>  
>  static void