git: a7fd3f511fc5 - stable/13 - bhyve: Remove an unused parameter from pci_nvme_append_iov_req()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Jan 2023 19:48:03 UTC
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=a7fd3f511fc50bd0db32f11b53fb23ffc82cf73a
commit a7fd3f511fc50bd0db32f11b53fb23ffc82cf73a
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-10-27 14:47:17 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-01-26 19:43:15 +0000
bhyve: Remove an unused parameter from pci_nvme_append_iov_req()
No functional change intended.
MFC after: 1 week
Reviewed by: jhb
Differential Revision: https://reviews.freebsd.org/D37116
(cherry picked from commit ae71263c6689a475f3df293475058048c0810dd7)
---
usr.sbin/bhyve/pci_nvme.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index 0c30f2cb7ff9..6572781e939c 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -2238,8 +2238,8 @@ pci_nvme_out_of_range(struct pci_nvme_blockstore *nvstore, uint64_t slba,
}
static int
-pci_nvme_append_iov_req(struct pci_nvme_softc *sc, struct pci_nvme_ioreq *req,
- uint64_t gpaddr, size_t size, int do_write, uint64_t offset)
+pci_nvme_append_iov_req(struct pci_nvme_softc *sc __unused,
+ struct pci_nvme_ioreq *req, uint64_t gpaddr, size_t size, uint64_t offset)
{
int iovidx;
bool range_is_contiguous;
@@ -2470,8 +2470,7 @@ nvme_write_read_blockif(struct pci_nvme_softc *sc,
uint16_t status = NVME_NO_STATUS;
size = MIN(PAGE_SIZE - (prp1 % PAGE_SIZE), bytes);
- if (pci_nvme_append_iov_req(sc, req, prp1,
- size, is_write, offset)) {
+ if (pci_nvme_append_iov_req(sc, req, prp1, size, offset)) {
err = -1;
goto out;
}
@@ -2483,8 +2482,7 @@ nvme_write_read_blockif(struct pci_nvme_softc *sc,
;
} else if (bytes <= PAGE_SIZE) {
size = bytes;
- if (pci_nvme_append_iov_req(sc, req, prp2,
- size, is_write, offset)) {
+ if (pci_nvme_append_iov_req(sc, req, prp2, size, offset)) {
err = -1;
goto out;
}
@@ -2510,8 +2508,8 @@ nvme_write_read_blockif(struct pci_nvme_softc *sc,
size = MIN(bytes, PAGE_SIZE);
- if (pci_nvme_append_iov_req(sc, req, *prp_list,
- size, is_write, offset)) {
+ if (pci_nvme_append_iov_req(sc, req, *prp_list, size,
+ offset)) {
err = -1;
goto out;
}