From nobody Mon Feb 21 21:57:46 2022 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 BD2DA19EAB67; Mon, 21 Feb 2022 21:57:46 +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 4K2bky4wM7z4gC0; Mon, 21 Feb 2022 21:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480666; 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=1jE40fM7dhZ68Atp5LI31FiKlzGRDwH+rZtORyAA32A=; b=bLlTS/B4vPGhp6bufoAMOh/6rBucy1op2bmFk33Celiy+ZhEyvhk1VIl2j/If7scRd+MLX EPsGM4TqFzn2leZQ7iL9RXtI4FeGMzNiVpxpu/Q/dIrNBVd+Wcgp7nHmqJ6LubJdDOorpL PsZDXS5CRSidkR5LUds02WfH5tOrhD5F+8UWj8Iewj6YiapSnIkgBmbkrxWGSi5tc53AWu /WhbD/qq6UsYXNUoqd8KGmGy4uj8zp1OAtnkfPHfNsDewqOHDbe9tqFw631abzg5o7SIwo XIgX8GMJ1qvVgUqDFf7FmDwyZqMtL2BbYCmVyTyetNB9NxGZhWlvo35tcicrRw== 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 84F9B18496; Mon, 21 Feb 2022 21:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21LLvkS4051879; Mon, 21 Feb 2022 21:57:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LLvkX5051878; Mon, 21 Feb 2022 21:57:46 GMT (envelope-from git) Date: Mon, 21 Feb 2022 21:57:46 GMT Message-Id: <202202212157.21LLvkX5051878@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: b7a2cf0d9102 - stable/13 - bhyve: fix NVMe MDTS comment 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/13 X-Git-Reftype: branch X-Git-Commit: b7a2cf0d9102b338dd00f0f3a6a7c135c1569d7c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480666; 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=1jE40fM7dhZ68Atp5LI31FiKlzGRDwH+rZtORyAA32A=; b=NPlfwolFcuaPFn2I/P4YdoGdcW9zSxO1hDAJp56C5OtDhU4grI/TwUffsK8TwQAYn2XXTN 94HKpf6aaN4MHsISq3moZZPzDCV1EXMlO9n69XAdZV16GtKf4/Px+3Dr6Z9q52g3bw6PV3 dAyy5xzT7N1n2c4es3BSxf0qNh0bI+uPJkl3ul5E4wDWP5ph0pCPzs+lebmnzVL0hoIYpJ v5BFJKszUXwj/vJnK4SLeGKaVsBIPpbL3ahHS91AtZR5xw6hDmBkUkQGwX1vQEDEH3ukkG s2l1bjzMAo0hQNw2EICl/b6d5eInncqE2PNYF2E26PzNvuof5wogWZTPJ4QLVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645480666; a=rsa-sha256; cv=none; b=rDNSB/kDjOrKbkv5zWb6b0d5AV7qhSHgAHlhS9hXofDBLEw3X35sS3cYbwoBugSFw3kEq7 JYJnm47g9kuddw5WzwaurJJSlcILAeim+aL71Y1Gf2AD7SVMabp1MmL1w61o2xvMWNpJPB EmKcFOysCI37g3E2XyEI1kyNuYnsp1Rr8uUZvkMYCuytuBvVvp11K/SNHtibVZBNp9/Spz 91sFZfi6udYxIDrq7JLi93/t4ZdMWFt8/Fhr/UNNhjSWsgNC8F11C20uye3OVEIwFa5mh7 fSUdeVl3//cnRsUwrqAww7QRGdEhBt9E9brzUqiolAz46FScxuWzQCQHHVzfsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=b7a2cf0d9102b338dd00f0f3a6a7c135c1569d7c commit b7a2cf0d9102b338dd00f0f3a6a7c135c1569d7c Author: Chuck Tuffli AuthorDate: 2021-06-24 16:54:05 +0000 Commit: Chuck Tuffli CommitDate: 2022-02-22 03:22:35 +0000 bhyve: fix NVMe MDTS comment Removes an obsolete comment and adds parenthesis around the macro while in the area. No functional change. (cherry picked from commit a11ca79cd9d00b102c7bf8a0b683fd85079a6346) --- usr.sbin/bhyve/pci_nvme.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index fdf4a46148c9..034c9409cea3 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -198,13 +198,11 @@ struct pci_nvme_blockstore { * Calculate the number of additional page descriptors for guest IO requests * based on the advertised Max Data Transfer (MDTS) and given the number of * default iovec's in a struct blockif_req. - * - * Note the + 1 allows for the initial descriptor to not be page aligned. */ #define MDTS_PAD_SIZE \ - NVME_MAX_IOVEC > BLOCKIF_IOV_MAX ? \ - NVME_MAX_IOVEC - BLOCKIF_IOV_MAX : \ - 0 + ( NVME_MAX_IOVEC > BLOCKIF_IOV_MAX ? \ + NVME_MAX_IOVEC - BLOCKIF_IOV_MAX : \ + 0 ) struct pci_nvme_ioreq { struct pci_nvme_softc *sc;