Commit c7bd57b6 authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

nvmf/vfio-user: define SPDK_PCI_VID_NUTANIX macro and use it in vfio-user 



Change-Id: I09820f484be3e962bcc4e80964d152e64957b331
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10550


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent b023e638

include/spdk/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern "C" { 
#define SPDK_PCI_VID_CNEXLABS		0x1d1d

#define SPDK_PCI_VID_VMWARE		0x15ad

#define SPDK_PCI_VID_REDHAT		0x1b36

#define SPDK_PCI_VID_NUTANIX		0x4e58



#define SPDK_PCI_CLASS_ANY_ID		0xffffff

/**

lib/nvmf/vfio_user.c

+3 −3
Original line number Diff line number Diff line
@@ -1884,7 +1884,7 @@ vfio_user_dev_info_fill(struct nvmf_vfio_user_transport *vu_transport, 
		SPDK_ERRLOG("vfu_ctx %p failed to initialize PCI\n", vfu_ctx);

		return ret;

	}

	vfu_pci_set_id(vfu_ctx, 0x4e58, 0x0001, 0x4e58, 0);

	vfu_pci_set_id(vfu_ctx, SPDK_PCI_VID_NUTANIX, 0x0001, SPDK_PCI_VID_NUTANIX, 0);

	/*

	 * 0x02, controller uses the NVM Express programming interface

	 * 0x08, non-volatile memory controller
@@ -2185,8 +2185,8 @@ nvmf_vfio_user_cdata_init(struct spdk_nvmf_transport *transport, 
			  struct spdk_nvmf_subsystem *subsystem,

			  struct spdk_nvmf_ctrlr_data *cdata)

{

	cdata->vid = 0x4e58;

	cdata->ssvid = 0x4e58;

	cdata->vid = SPDK_PCI_VID_NUTANIX;

	cdata->ssvid = SPDK_PCI_VID_NUTANIX;

	cdata->ieee[0] = 0x8d;

	cdata->ieee[1] = 0x6b;

	cdata->ieee[2] = 0x50;