Message ID | 20200820165901.1139109-12-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | block/nvme: Various cleanups required to use multiple queues | expand |
On Thu, Aug 20, 2020 at 06:58:57PM +0200, Philippe Mathieu-Daudé wrote: > nvme_init_queue() doesn't require BlockDriverState anymore. > Replace it by BDRVNVMeState to simplify. > > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > block/nvme.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> > > diff --git a/block/nvme.c b/block/nvme.c > index f180078e781..5b69fc75a60 100644 > --- a/block/nvme.c > +++ b/block/nvme.c > @@ -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) > { > - BDRVNVMeState *s = bs->opaque; > size_t bytes; > 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; > } > > - 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) { > error_propagate(errp, local_err); > goto fail; > } > 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) { > error_propagate(errp, local_err); > goto fail; > -- > 2.26.2 > >
diff --git a/block/nvme.c b/block/nvme.c index f180078e781..5b69fc75a60 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -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) { - BDRVNVMeState *s = bs->opaque; size_t bytes; 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; } - 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) { error_propagate(errp, local_err); goto fail; } 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) { error_propagate(errp, local_err); goto fail;