From nobody Sun Jan 28 01:33:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMv8x3mGLz57NF5; Sun, 28 Jan 2024 01:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMv8x2qzSz4dXT; Sun, 28 Jan 2024 01:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HsQfX798HgxL8EH60zrh7dzYE1fLydT4a2GoVXnZ7iU=; b=ae3ku+nb52tPKTkr8wRxpQfSBCtw/lgpZG7jOB4+5hMPMCoQaJXfUKhH32OpuLPZ9ASISl 04jEYjSYKvTyPemOEo0U56NScrD8h2XvebUyQ3X6CphjOilOBsq9yMnGEZZ2Djqt/2yjH0 0rueS+DWxmq8l3a7ZAPKvOBgVV8WXEg6jToO1ubxbd6Z0l5aXUeXClTHqHAqLO4soCAnGZ 70yDQwRrgQkbk0N8skm2Mwetysq9ZnT/CY+Y+YC3E+85vUOSntwuTpJ6RL0I9Bc+0uwX/Q f6j4U/GlDtK4x490VHoPVHo0EgBieAv7EbqZ6zw0ymBDiDhYeC+LlPtUVZ8nzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HsQfX798HgxL8EH60zrh7dzYE1fLydT4a2GoVXnZ7iU=; b=lBJVhU3kguhsA1EomZmJjpoI5xOwLNEJX17KHayCayPC7fAvHlJ5slTKYvBhnpSi0rY9yw KSwFwj2vGIjuLjI4tSQ4gfp+S+CZSKrnoXgnTZCtK5QxsjI+nFHDuk4kARAff0n5HQvzuA vBlp25/Nl2QyKXD5DD3x+E5zcdJOKl1gl6K+n1YVK8TRem3058hJXpiKkNdo3MAuPetVcH Bilm2htFOe7hWokGSmfx//ivE19lrjpyrzOy+KRTf3nRrMHgnP47ERfWnGJObHyvXdbIFD KDMq/NAfRvKuOtsIUdj8bsbYoJ8T5z3jbmr1+NHav9cR5/YjCTBv/q82d/RciA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706405633; a=rsa-sha256; cv=none; b=pGFAsrhkjt//TfLiagC4RB6HyAkm4P/R8Z4ike5YmQpkaNEdAMS34uqd3tbBHFurJpd5OK wrY1Nb6SMr9A+GW9TUh6AcutjqklyzYM6SYKFwYxM5eQ8IM8KG36nJe8JYK2N5iUWYq6Fq DPvqieJzYKatMzsScEvfyLkxTTMZ5ugPVlDFnxA2/tzUWhc6cLnLSG/8oP7LuBTctZHJYD MFOyuI9KA/qNFcsXnk2MOTcf5JIjwGWGeF9w0NgWrNXuNcHqqnlSdl0voGHYf8a+IV9jpz ynA5CK5h1LyCeOgbAsrQ+ADcHhTGG+sUa1OAMT4UhoMpinObQ5s3xm95avCFXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMv8x1t76zp2L; Sun, 28 Jan 2024 01:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40S1XrBq062680; Sun, 28 Jan 2024 01:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S1XrwO062677; Sun, 28 Jan 2024 01:33:53 GMT (envelope-from git) Date: Sun, 28 Jan 2024 01:33:53 GMT Message-Id: <202401280133.40S1XrwO062677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 55210b704a05 - stable/14 - Revert "bhyve nvme: Add NQN value" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55210b704a056dfb2ea115edb3894efe16b7411b Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=55210b704a056dfb2ea115edb3894efe16b7411b commit 55210b704a056dfb2ea115edb3894efe16b7411b Author: Chuck Tuffli AuthorDate: 2024-01-28 01:33:37 +0000 Commit: Chuck Tuffli 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); }