From d6f7c148f866852685e3afc5948311500382ce0f Mon Sep 17 00:00:00 2001 From: Ivan Velickovic Date: Wed, 25 Sep 2024 00:32:26 +1000 Subject: [PATCH] drivers/blk/virtio: make setvars consistent with other block drivers The i.MX8 uSDHC driver uses `blk_req_queue` and `blk_resp_queue` which makes more sense. So we make the virtIO driver conssitent with it. Signed-off-by: Ivan Velickovic --- drivers/blk/virtio/block.c | 6 +++--- examples/blk/board/qemu_virt_aarch64/blk.system | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/blk/virtio/block.c b/drivers/blk/virtio/block.c index 086148450..f25fd088c 100644 --- a/drivers/blk/virtio/block.c +++ b/drivers/blk/virtio/block.c @@ -49,8 +49,8 @@ uintptr_t blk_regs; blk_storage_info_t *blk_storage_info; -uintptr_t blk_request; -uintptr_t blk_response; +blk_req_queue_t *blk_req_queue; +blk_resp_queue_t *blk_resp_queue; uintptr_t requests_paddr; uintptr_t requests_vaddr; @@ -395,7 +395,7 @@ void init(void) regs = (volatile virtio_mmio_regs_t *)(blk_regs + VIRTIO_MMIO_BLK_OFFSET); virtio_blk_init(); - blk_queue_init(&blk_queue, (blk_req_queue_t *)blk_request, (blk_resp_queue_t *)blk_response, QUEUE_SIZE); + blk_queue_init(&blk_queue, blk_req_queue, blk_resp_queue, QUEUE_SIZE); } void notified(microkit_channel ch) diff --git a/examples/blk/board/qemu_virt_aarch64/blk.system b/examples/blk/board/qemu_virt_aarch64/blk.system index c171d03ce..5d3d59040 100644 --- a/examples/blk/board/qemu_virt_aarch64/blk.system +++ b/examples/blk/board/qemu_virt_aarch64/blk.system @@ -29,8 +29,8 @@ - - + +