PSARC/2007/522 Disk enumeration for Sun Fire X4200 and X4200 M2

PSARC/2008/077 Multiplexed I/O Enhancements to Support FMA
5039931 glm fails to use DDI-compliant interface for scsi_pkt(9S) allocation
5039932 mpt fails to use DDI-compliant interface for scsi_pkt(9S) allocation
5039935 esp fails to use DDI-compliant interface for scsi_pkt(9S) allocation
5039936 fas fails to use DDI-compliant interface for scsi_pkt(9S) allocation
5039937 ifp fails to use DDI-compliant interface for scsi_pkt(9S) allocation
5039938 isp fails to use DDI-compliant interface for scsi_pkt(9S) allocation
5039941 sf fails to use DDI-compliant interface for scsi_pkt(9S) allocation
6276696 USCSI should support a path selection mechanism in conjunction with scsi_vhci
6284426 di_path_addr should have its second argument removed.
6425326 prtconf pathinfo output should show path's pHCI unit-address (di_path_addr)
6657250 devid should be available at interrupt time
6657251 libtopo: disk enumeration needs to be shared by multiple enumeration strategies
6657252 libtopo: xmlgen files should use consistent format
6657253 fmdump: add support for filtering on nvpair (and value)
6657254 eversholt: support devid-based mapping to topology
6657255 eversholt: define property indicating ereport may not map to topology
6657256 SCSA should detect scsi_pkt allocation violations
6657257 Multiplexed I/O Enhancements to Support FMA
6657258 libnvpair: need nvlist_lookup_nvpair peer that supports embeded nvlist
6695221 scsa1394 fails to use DDI-compliant interface for scsi_pkt(9S) allocation
6695222 ata has dependency on scsi_device(9S) size
6695223 ncrs fails to use DDI-compliant interface for scsi_pkt(9S) allocation
6695224 st fails to use DDI-compliant interface for scsi_pkt(9S) allocation

1 files changed, 5 insertions, 3 deletions

diff --git a/usr/src/lib/libdiskmgt/common/findevs.c b/usr/src/lib/libdiskmgt/common/findevs.c
index 076281693d..81230e6323 100644
--- a/usr/src/lib/libdiskmgt/common/findevs.c
+++ b/usr/src/lib/libdiskmgt/common/findevs.c
@@ -688,7 +688,7 @@ add_disk2controller(disk_t *diskp, struct search_args *args)
 	    /* note: mpxio di_path stuff is all consolidation private */
 	    di_path_t   pi = DI_PATH_NIL;
 
-	    while ((pi = di_path_next_phci(node, pi)) != DI_PATH_NIL) {
+	    while ((pi = di_path_client_next_path(node, pi)) != DI_PATH_NIL) {
 		int	cnt;
 		uchar_t	*bytes;
 		char	str[MAXPATHLEN];
@@ -770,7 +770,8 @@ add_int2array(int p, int **parray)
 
 	cnt = 0;
 	if (pa != NULL) {
-	    for (; pa[cnt] != -1; cnt++);
+	    for (; pa[cnt] != -1; cnt++)
+		;
 	}
 
 	new_array = (int *)calloc(cnt + 2, sizeof (int *));
@@ -804,7 +805,8 @@ add_ptr2array(void *p, void ***parray)
 
 	cnt = 0;
 	if (pa != NULL) {
-	    for (; pa[cnt]; cnt++);
+	    for (; pa[cnt]; cnt++)
+		;
 	}
 
 	new_array = (void **)calloc(cnt + 2, sizeof (void *));