svn commit: r196416 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/hptrr dev/xen/xenpci

[Ken Smith]

Author: kensmith
Date: Fri Aug 21 01:12:06 2009
New Revision: 196416
URL: http://svn.freebsd.org/changeset/base/196416

Log:
  MFC r196415:
  Fix a boot hang for hptrr(4) caused by changes introduced in r195534.
  It is necessary to make sure cpi->transport is set for xpt_scan_bus() to
  work properly.
  
  Submitted by: Bernhard Schmidt (scb+freebsd-current <at> techwires
                <dot> net)
  Reviewed by:  scottl
  Approved by:  re (kib)

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/hptrr/hptrr_osm_bsd.c
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/hptrr/hptrr_osm_bsd.c
==============================================================================
--- stable/8/sys/dev/hptrr/hptrr_osm_bsd.c	Fri Aug 21 01:00:15 2009	(r196415)
+++ stable/8/sys/dev/hptrr/hptrr_osm_bsd.c	Fri Aug 21 01:12:06 2009	(r196416)
@@ -814,6 +814,10 @@ static void hpt_action(struct cam_sim *s
 		strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strncpy(cpi->hba_vid, "HPT   ", HBA_IDLEN);
 		strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
+		cpi->transport = XPORT_SPI;
+		cpi->transport_version = 2;
+		cpi->protocol = PROTO_SCSI;
+		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}