diff options
| author | Philippe Mathieu-Daudé | 2020-08-21 21:53:47 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2020-09-07 12:23:55 +0200 |
| commit | 0ea45f76eb78b7c05929779ee1f5b1f365c66927 (patch) | |
| tree | 676717a7de4dca1b4e11e8b9aeaa93621cc7f620 | |
| parent | block/nvme: Avoid further processing if trace event not enabled (diff) | |
| download | qemu-0ea45f76eb78b7c05929779ee1f5b1f365c66927.tar.gz qemu-0ea45f76eb78b7c05929779ee1f5b1f365c66927.tar.xz qemu-0ea45f76eb78b7c05929779ee1f5b1f365c66927.zip | |
block/nvme: Let nvme_create_queue_pair() fail gracefully
As nvme_create_queue_pair() is allowed to fail, replace the
alloc() calls by try_alloc() to avoid aborting QEMU.
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-4-philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/nvme.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/block/nvme.c b/block/nvme.c index 4d4f728159..ca8b039f4f 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -213,14 +213,22 @@ static NVMeQueuePair *nvme_create_queue_pair(BlockDriverState *bs, int i, r; BDRVNVMeState *s = bs->opaque; Error *local_err = NULL; - NVMeQueuePair *q = g_new0(NVMeQueuePair, 1); + NVMeQueuePair *q; uint64_t prp_list_iova; + q = g_try_new0(NVMeQueuePair, 1); + if (!q) { + return NULL; + } + q->prp_list_pages = qemu_try_blockalign0(bs, + s->page_size * NVME_NUM_REQS); + if (!q->prp_list_pages) { + goto fail; + } qemu_mutex_init(&q->lock); q->s = s; q->index = idx; qemu_co_queue_init(&q->free_req_queue); - q->prp_list_pages = qemu_blockalign0(bs, s->page_size * NVME_NUM_REQS); q->completion_bh = aio_bh_new(bdrv_get_aio_context(bs), nvme_process_completion_bh, q); r = qemu_vfio_dma_map(s->vfio, q->prp_list_pages, |