D43601.1774911214.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D43601.1774911214.diff
View Options

	diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
	--- a/sys/dev/nvme/nvme.h
	+++ b/sys/dev/nvme/nvme.h
	@@ -605,7 +605,7 @@
	#define NVME_FEAT_SET_FID_MASK (0xff)

	/* Helper macro to combine _MASK and _SHIFT defines */
	-#define NVMEB(name) (name##_MASK << name##_SHIFT)
	+#define NVMEM(name) (name##_MASK << name##_SHIFT)

	/* Helper macro to extract value from x */
	#define NVMEV(name, x) (((x) >> name##_SHIFT) & name##_MASK)
	diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
	--- a/usr.sbin/bhyve/pci_nvme.c
	+++ b/usr.sbin/bhyve/pci_nvme.c
	@@ -538,12 +538,12 @@

	cd->cntrltype = NVME_CNTRLTYPE_IO;
	cd->oacs = 1 << NVME_CTRLR_DATA_OACS_FORMAT_SHIFT;
	- cd->oaes = NVMEB(NVME_CTRLR_DATA_OAES_NS_ATTR);
	+ cd->oaes = NVMEM(NVME_CTRLR_DATA_OAES_NS_ATTR);
	cd->acl = 2;
	cd->aerl = 4;

	/* Advertise 1, Read-only firmware slot */
	- cd->frmw = NVMEB(NVME_CTRLR_DATA_FRMW_SLOT1_RO) \|
	+ cd->frmw = NVMEM(NVME_CTRLR_DATA_FRMW_SLOT1_RO) \|
	(1 << NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT);
	cd->lpa = 0; /* TODO: support some simple things like SMART */
	cd->elpe = 0; /* max error log page entries */