ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/block/nvme: remove redundant has_sg member 

Remove the has_sg member from NvmeRequest since it's redundant.

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>
This commit is contained in:
Klaus Jensen 2020-07-29 21:08:04 +02:00
parent 904248a53f
commit 13b4463d8b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/block/nvme.c
View File

@ -565,7 +565,8 @@ static void nvme_rw_cb(void *opaque, int ret)
block_acct_failed(blk_get_stats(n->conf.blk), &req->acct); block_acct_failed(blk_get_stats(n->conf.blk), &req->acct);
req->status = NVME_INTERNAL_DEV_ERROR; req->status = NVME_INTERNAL_DEV_ERROR;
} }
if (req->has_sg) {
if (req->qsg.nalloc) {
qemu_sglist_destroy(&req->qsg); qemu_sglist_destroy(&req->qsg);
} }
nvme_enqueue_req_completion(cq, req); nvme_enqueue_req_completion(cq, req);
@ -574,7 +575,6 @@ static void nvme_rw_cb(void *opaque, int ret)
static uint16_t nvme_flush(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, static uint16_t nvme_flush(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
NvmeRequest *req) NvmeRequest *req)
{ {
req->has_sg = false;
block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0, block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0,
BLOCK_ACCT_FLUSH); BLOCK_ACCT_FLUSH);
req->aiocb = blk_aio_flush(n->conf.blk, nvme_rw_cb, req); req->aiocb = blk_aio_flush(n->conf.blk, nvme_rw_cb, req);
@ -600,7 +600,6 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
return NVME_LBA_RANGE | NVME_DNR; return NVME_LBA_RANGE | NVME_DNR;
} }
req->has_sg = false;
block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0, block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0,
BLOCK_ACCT_WRITE); BLOCK_ACCT_WRITE);
req->aiocb = blk_aio_pwrite_zeroes(n->conf.blk, offset, count, req->aiocb = blk_aio_pwrite_zeroes(n->conf.blk, offset, count,
@ -638,7 +637,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
} }
if (req->qsg.nsg > 0) { if (req->qsg.nsg > 0) {
req->has_sg = true;
block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->qsg.size, block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->qsg.size,
acct); acct);
req->aiocb = is_write ? req->aiocb = is_write ?
@ -647,7 +645,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
dma_blk_read(n->conf.blk, &req->qsg, data_offset, BDRV_SECTOR_SIZE, dma_blk_read(n->conf.blk, &req->qsg, data_offset, BDRV_SECTOR_SIZE,
nvme_rw_cb, req); nvme_rw_cb, req);
} else { } else {
req->has_sg = false;
block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->iov.size, block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->iov.size,
acct); acct);
req->aiocb = is_write ? req->aiocb = is_write ?

1
hw/block/nvme.h
View File

@ -22,7 +22,6 @@ typedef struct NvmeRequest {
struct NvmeSQueue *sq; struct NvmeSQueue *sq;
BlockAIOCB *aiocb; BlockAIOCB *aiocb;
uint16_t status; uint16_t status;
bool has_sg;
NvmeCqe cqe; NvmeCqe cqe;
BlockAcctCookie acct; BlockAcctCookie acct;
QEMUSGList qsg; QEMUSGList qsg;