motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block/nvme: Simplify nvme_init_queue() arguments

Browse source 
nvme_init_queue() doesn't require BlockDriverState anymore.
Replace it by BDRVNVMeState to simplify.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200821195359.1285345-12-philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-08-21 21:53:55 +02:00 • committed by Kevin Wolf
parent 38e1f8186f
commit 3a6d34d066
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
block/nvme.c
View file

@ -165,10 +165,9 @@ static QemuOptsList runtime_opts = {
}, },
}; };
static void nvme_init_queue(BlockDriverState *bs, NVMeQueue *q, static void nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q,
int nentries, int entry_bytes, Error **errp) int nentries, int entry_bytes, Error **errp)
{ {
BDRVNVMeState *s = bs->opaque;
size_t bytes; size_t bytes;
int r; int r;
@ -251,14 +250,14 @@ static NVMeQueuePair *nvme_create_queue_pair(BlockDriverState *bs,
req->prp_list_iova = prp_list_iova + i * s->page_size; req->prp_list_iova = prp_list_iova + i * s->page_size;
} }
nvme_init_queue(bs, &q->sq, size, NVME_SQ_ENTRY_BYTES, &local_err); nvme_init_queue(s, &q->sq, size, NVME_SQ_ENTRY_BYTES, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
goto fail; goto fail;
} }
q->sq.doorbell = &s->regs->doorbells[idx * 2 * s->doorbell_scale]; q->sq.doorbell = &s->regs->doorbells[idx * 2 * s->doorbell_scale];
nvme_init_queue(bs, &q->cq, size, NVME_CQ_ENTRY_BYTES, &local_err); nvme_init_queue(s, &q->cq, size, NVME_CQ_ENTRY_BYTES, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
goto fail; goto fail;