diff options
| author | Klaus Jensen <k.jensen@samsung.com> | 2020-07-29 21:55:37 +0200 |
|---|---|---|
| committer | Klaus Jensen <k.jensen@samsung.com> | 2020-09-02 08:48:50 +0200 |
| commit | 82386d4a0f19ff1e6a04e29f104da1d12269539e (patch) | |
| tree | a6d02dd3f40980c63a4bf41ba2a4203b190b2a9b /hw/block | |
| parent | d424d36a496da064de866469a344b07b771fbc12 (diff) | |
| download | qemu-82386d4a0f19ff1e6a04e29f104da1d12269539e.zip | |
hw/block/nvme: remove explicit qsg/iov parameters
Since nvme_map_prp always operate on the request-scoped qsg/iovs, just
pass a single pointer to the NvmeRequest instead of two for each of the
qsg and iov.
Suggested-by: Minwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/nvme.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 01648cfb4d..63078f6009 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -299,8 +299,8 @@ static uint16_t nvme_map_addr(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, return NVME_SUCCESS; } -static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, - uint64_t prp2, uint32_t len, NvmeCtrl *n) +static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2, + uint32_t len, NvmeRequest *req) { hwaddr trans_len = n->page_size - (prp1 % n->page_size); trans_len = MIN(len, trans_len); @@ -308,6 +308,9 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, uint16_t status; bool prp_list_in_cmb = false; + QEMUSGList *qsg = &req->qsg; + QEMUIOVector *iov = &req->iov; + trace_pci_nvme_map_prp(trans_len, len, prp1, prp2, num_prps); if (unlikely(!prp1)) { @@ -401,7 +404,7 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, { uint16_t status = NVME_SUCCESS; - status = nvme_map_prp(&req->qsg, &req->iov, prp1, prp2, len, n); + status = nvme_map_prp(n, prp1, prp2, len, req); if (status) { return status; } @@ -446,7 +449,7 @@ static uint16_t nvme_map_dptr(NvmeCtrl *n, size_t len, NvmeRequest *req) uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); - return nvme_map_prp(&req->qsg, &req->iov, prp1, prp2, len, n); + return nvme_map_prp(n, prp1, prp2, len, req); } static void nvme_post_cqes(void *opaque) |