Author: mav
Date: Thu Aug 8 02:00:11 2019
New Revision: 350716
URL: https://svnweb.freebsd.org/changeset/base/350716
Log:
MFC r345817: Build NVMe CAM transport unrelated to NVMe SIM.
Before this I suppose it was impossible load CAM-based NVMe as module.
Plus this appeared to be needed to build r345815 without NVMe driver.
Modified:
stable/12/sys/cam/nvme/nvme_da.c
stable/12/sys/conf/files
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/cam/nvme/nvme_da.c
==============================================================================
--- stable/12/sys/cam/nvme/nvme_da.c Thu Aug 8 01:37:41 2019
(r350715)
+++ stable/12/sys/cam/nvme/nvme_da.c Thu Aug 8 02:00:11 2019
(r350716)
@@ -759,10 +759,6 @@ ndaregister(struct cam_periph *periph, void *arg)
softc->quirks = quirks;
cam_iosched_set_sort_queue(softc->cam_iosched, 0);
softc->disk = disk = disk_alloc();
- strlcpy(softc->disk->d_descr, cd->mn,
- MIN(sizeof(softc->disk->d_descr), sizeof(cd->mn)));
- strlcpy(softc->disk->d_ident, cd->sn,
- MIN(sizeof(softc->disk->d_ident), sizeof(cd->sn)));
disk->d_rotation_rate = DISK_RR_NON_ROTATING;
disk->d_open = ndaopen;
disk->d_close = ndaclose;
@@ -801,9 +797,9 @@ ndaregister(struct cam_periph *periph, void *arg)
* d_ident and d_descr are both far bigger than the length of either
* the serial or model number strings.
*/
- nvme_strvis(disk->d_descr, cd->mn,
+ cam_strvis(disk->d_descr, cd->mn,
sizeof(disk->d_descr), NVME_MODEL_NUMBER_LENGTH);
- nvme_strvis(disk->d_ident, cd->sn,
+ cam_strvis(disk->d_ident, cd->sn,
sizeof(disk->d_ident), NVME_SERIAL_NUMBER_LENGTH);
disk->d_hba_vendor = cpi.hba_vendor;
disk->d_hba_device = cpi.hba_device;
Modified: stable/12/sys/conf/files
==============================================================================
--- stable/12/sys/conf/files Thu Aug 8 01:37:41 2019 (r350715)
+++ stable/12/sys/conf/files Thu Aug 8 02:00:11 2019 (r350716)
@@ -78,9 +78,9 @@ cam/cam_xpt.c optional scbus
cam/ata/ata_all.c optional scbus
cam/ata/ata_xpt.c optional scbus
cam/ata/ata_pmp.c optional scbus
-cam/nvme/nvme_all.c optional scbus nvme
-cam/nvme/nvme_da.c optional scbus nvme da
-cam/nvme/nvme_xpt.c optional scbus nvme
+cam/nvme/nvme_all.c optional scbus
+cam/nvme/nvme_da.c optional nda | da
+cam/nvme/nvme_xpt.c optional scbus
cam/scsi/scsi_xpt.c optional scbus
cam/scsi/scsi_all.c optional scbus
cam/scsi/scsi_cd.c optional cd
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
