D42058.diff
No OneTemporary
Actions

Size

892 B

Referenced Files

None

Subscribers

None

D42058.diff
View Options

	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
	@@ -514,6 +514,7 @@
	pci_nvme_init_ctrldata(struct pci_nvme_softc *sc)
	{
	struct nvme_controller_data *cd = &sc->ctrldata;
	+ int ret;

	cd->vid = 0xFB5D;
	cd->ssvid = 0x0000;
	@@ -583,6 +584,13 @@
	NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT;

	cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT;
	+
	+ ret = snprintf(cd->subnqn, sizeof(cd->subnqn),
	+ "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u",
	+ get_config_value("name"), sc->nsc_pi->pi_bus,
	+ sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func);
	+ if ((ret < 0) \|\| ((unsigned)ret > sizeof(cd->subnqn)))
	+ EPRINTLN("%s: error setting subnqn (%d)", __func__, ret);
	}

	static void
	@@ -3309,7 +3317,6 @@
	pci_nvme_aen_init(sc);

	pci_nvme_reset(sc);
	-
	done:
	return (error);
	}