svn commit: r296891 - in head/sys: cam dev/arcmsr dev/iir dev/isci dev/ncr dev/ppbus

[Andrew Turner]

On Tue, 15 Mar 2016 05:17:29 +0000 (UTC)
Warner Losh <imp at FreeBSD.org> wrote:
...
> Modified: head/sys/dev/ppbus/vpo.c
> ==============================================================================
> --- head/sys/dev/ppbus/vpo.c	Tue Mar 15 04:56:39 2016
> (r296890) +++ head/sys/dev/ppbus/vpo.c	Tue Mar 15 05:17:29
> 2016	(r296891) @@ -187,17 +187,19 @@ vpo_intr(struct vpo_data
...

> @@ -307,11 +309,15 @@ vpo_action(struct cam_sim *sim, union cc
>  
>  		csio = &ccb->csio;
>  
> +		if (ccb->ccb_h.flags & CAM_CDB_PHYS) {
> +			ccb->ccb_h.status = CAM_REQ_INVALID;
> +			xpt_done(ccb);
> +			break;
> +		}
>  #ifdef VP0_DEBUG
>  		device_printf(vpo->vpo_dev, "XPT_SCSI_IO (0x%x)
> request\n",
> -			csio->cdb_io.cdb_bytes[0]);
> +		    scsiio_cdb_ptr(csio));

This is broken, scsiio_cdb_ptr returns a uint8_t * while %x expects an
int.

Andrew