D37116.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D37116.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
	@@ -2218,8 +2218,8 @@
	}

	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;
	@@ -2450,8 +2450,7 @@
	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;
	}
	@@ -2463,8 +2462,7 @@
	;
	} 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;
	}
	@@ -2490,8 +2488,8 @@

	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;
	}