git: 55210b704a05 - stable/14 - Revert "bhyve nvme: Add NQN value"

[Chuck Tuffli]

The branch stable/14 has been updated by chuck:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=55210b704a056dfb2ea115edb3894efe16b7411b

commit 55210b704a056dfb2ea115edb3894efe16b7411b
Author:     Chuck Tuffli <ch...@freebsd.org>
AuthorDate: 2024-01-28 01:33:37 +0000
Commit:     Chuck Tuffli <ch...@freebsd.org>
CommitDate: 2024-01-28 01:33:37 +0000

    Revert "bhyve nvme: Add NQN value"
    
    This reverts commit 4bd4942ea70becc583246597b658f3dcdbffafde.
---
 usr.sbin/bhyve/pci_nvme.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index 2fd49a84c768..d1b15d6f3a3c 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -514,7 +514,6 @@ static void
 pci_nvme_init_ctrldata(struct pci_nvme_softc *sc)
 {
        struct nvme_controller_data *cd = &sc->ctrldata;
-       int ret;
 
        cd->vid = 0xFB5D;
        cd->ssvid = 0x0000;
@@ -584,13 +583,6 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc)
            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
@@ -3317,6 +3309,7 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl)
        pci_nvme_aen_init(sc);
 
        pci_nvme_reset(sc);
+
 done:
        return (error);
 }