From owner-svn-src-all@FreeBSD.ORG  Mon Jun 14 22:02:18 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C09E71065675;
	Mon, 14 Jun 2010 22:02:18 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B00578FC0A;
	Mon, 14 Jun 2010 22:02:18 +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 o5EM2I15083622;
	Mon, 14 Jun 2010 22:02:18 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5EM2I1P083620;
	Mon, 14 Jun 2010 22:02:18 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201006142202.o5EM2I1P083620@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Mon, 14 Jun 2010 22:02:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209188 - head/sys/cam/scsi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jun 2010 22:02:18 -0000

Author: ken
Date: Mon Jun 14 22:02:18 2010
New Revision: 209188
URL: http://svn.freebsd.org/changeset/base/209188

Log:
  For the target port groups structures, don't allocate the initial element.
  This makes things easier for target implementations to calculate how many
  elements they need to allocate.
  
  Discussed with:	mjacob, gibbs
  MFC after:	1 week

Modified:
  head/sys/cam/scsi/scsi_all.h

Modified: head/sys/cam/scsi/scsi_all.h
==============================================================================
--- head/sys/cam/scsi/scsi_all.h	Mon Jun 14 21:58:55 2010	(r209187)
+++ head/sys/cam/scsi/scsi_all.h	Mon Jun 14 22:02:18 2010	(r209188)
@@ -902,6 +902,7 @@ struct scsi_target_group
 struct scsi_target_port_descriptor {
 	uint8_t	reserved[2];
 	uint8_t	relative_target_port_identifier[2];
+	uint8_t desc_list[];
 };
 
 struct scsi_target_port_group_descriptor {
@@ -928,12 +929,12 @@ struct scsi_target_port_group_descriptor
 	uint8_t status;
 	uint8_t vendor_specific;
 	uint8_t	target_port_count;
-	struct scsi_target_port_descriptor descriptors[1];
+	struct scsi_target_port_descriptor descriptors[];
 };
 
 struct scsi_target_group_data {
 	uint8_t length[4];	/* length of returned data, in bytes */
-	struct scsi_target_port_group_descriptor groups[1];
+	struct scsi_target_port_group_descriptor groups[];
 };
 
 struct scsi_target_group_data_extended {
@@ -941,7 +942,7 @@ struct scsi_target_group_data_extended {
 	uint8_t format_type;	/* STG_PDF_LENGTH or RPL_PDF_EXTENDED */
 	uint8_t	implicit_transition_time;
 	uint8_t reserved[2];
-	struct scsi_target_port_group_descriptor groups[1];
+	struct scsi_target_port_group_descriptor groups[];
 };