diff options
| author | Hans Rosenfeld <hans.rosenfeld@joyent.com> | 2015-09-29 12:39:16 +0200 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@joyent.com> | 2017-10-04 16:11:01 +0000 |
| commit | 94e74f1ae13f8186ead6d7e6d2e4c93275126448 (patch) | |
| tree | 5990f60f2b218da0461e3f4612ee767acc3c8a7b /usr/src/lib/libdiskmgt/common/findevs.c | |
| parent | 008eb7c268f95ec753ecee7564ab56c8972f1fe2 (diff) | |
| download | illumos-joyent-94e74f1ae13f8186ead6d7e6d2e4c93275126448.tar.gz | |
OS-5880 diskinfo should identify NVMe and SATA devices
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src/lib/libdiskmgt/common/findevs.c')
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/findevs.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/usr/src/lib/libdiskmgt/common/findevs.c b/usr/src/lib/libdiskmgt/common/findevs.c index 68384c1ca1..7b2d951e3a 100644 --- a/usr/src/lib/libdiskmgt/common/findevs.c +++ b/usr/src/lib/libdiskmgt/common/findevs.c @@ -23,6 +23,7 @@ * Use is subject to license terms. * Copyright (c) 2011 by Delphix. All rights reserved. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright 2017 Joyent, Inc. */ #include <fcntl.h> @@ -64,6 +65,10 @@ #define WWN_PROP "node-wwn" static char *ctrltypes[] = { + DDI_NT_NVME_NEXUS, + DDI_NT_NVME_ATTACHMENT_POINT, + DDI_NT_SATA_NEXUS, + DDI_NT_SATA_ATTACHMENT_POINT, DDI_NT_SCSI_NEXUS, DDI_NT_SCSI_ATTACHMENT_POINT, DDI_NT_FC_ATTACHMENT_POINT, @@ -1120,9 +1125,19 @@ ctype(di_node_t node, di_minor_t minor) return (DM_CTYPE_USB); } + if (libdiskmgt_str_eq(type, DDI_NT_NVME_NEXUS) || + libdiskmgt_str_eq(type, DDI_NT_NVME_ATTACHMENT_POINT)) { + return (DM_CTYPE_NVME); + } + + if (libdiskmgt_str_eq(type, DDI_NT_SATA_NEXUS) || + libdiskmgt_str_eq(type, DDI_NT_SATA_ATTACHMENT_POINT)) { + return (DM_CTYPE_SATA); + } + if (libdiskmgt_str_eq(type, DDI_NT_SCSI_NEXUS) || libdiskmgt_str_eq(type, DDI_NT_SCSI_ATTACHMENT_POINT)) { - return (DM_CTYPE_SCSI); + return (DM_CTYPE_SCSI); } if (libdiskmgt_str_eq(type, DDI_NT_FC_ATTACHMENT_POINT)) { |