From owner-svn-src-stable@FreeBSD.ORG  Fri Aug 21 01:12:06 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7016E106568B;
	Fri, 21 Aug 2009 01:12:06 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5CFD18FC3D;
	Fri, 21 Aug 2009 01:12:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7L1C6Tb006872;
	Fri, 21 Aug 2009 01:12:06 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7L1C6tJ006870;
	Fri, 21 Aug 2009 01:12:06 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <200908210112.n7L1C6tJ006870@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Fri, 21 Aug 2009 01:12:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196416 - in stable/8/sys: . amd64/include/xen
	cddl/contrib/opensolaris contrib/dev/acpica contrib/pf
	dev/hptrr dev/xen/xenpci
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Aug 2009 01:12:06 -0000

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;
 	}