Commit 988ce2ec authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: use assert for INTEL_VID check on log pages 



We can only get to this code path if the controller
has vid==INTEL, so make that more clear by changing
the check to an assert.

Remove unit test that calls
nvme_ctrlr_construct_intel_support_log_page_list()
for a controller that is not VID==INTEL - this is
no longer valid.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I3b58451bc95992bf641e7452f0ac4c2bac9fe31c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13523


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 4a24f581

lib/nvme/nvme_ctrlr.c

+1 −3
Original line number Diff line number Diff line
@@ -629,9 +629,7 @@ nvme_ctrlr_construct_intel_support_log_page_list(struct spdk_nvme_ctrlr *ctrlr, 
		return;

	}



	if (ctrlr->cdata.vid != SPDK_PCI_VID_INTEL) {

		return;

	}

	assert(ctrlr->cdata.vid == SPDK_PCI_VID_INTEL);



	ctrlr->log_page_supported[SPDK_NVME_INTEL_LOG_PAGE_DIRECTORY] = true;

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+0 −4
Original line number Diff line number Diff line
@@ -1830,10 +1830,6 @@ test_nvme_ctrlr_construct_intel_support_log_page_list(void) 
	ctrlr.quirks = nvme_get_quirks(&pci_id);

	CU_ASSERT(ctrlr.quirks == 0);



	nvme_ctrlr_construct_intel_support_log_page_list(&ctrlr, &payload);

	res = spdk_nvme_ctrlr_is_log_page_supported(&ctrlr, SPDK_NVME_INTEL_LOG_TEMPERATURE);

	CU_ASSERT(res == false);



	/* Set the vendor to Intel, but provide no device id */

	pci_id.class_id = SPDK_PCI_CLASS_NVME;

	ctrlr.cdata.vid = pci_id.vendor_id = SPDK_PCI_VID_INTEL;