84 lines
2.7 KiB
Diff
84 lines
2.7 KiB
Diff
|
From 73d83d8880e85eedc22c9651b67d1eacd5de5ff4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sergio Lopez Pascual <slp@redhat.com>
|
||
|
|
Date: Wed, 24 Jun 2020 13:24:52 -0400
|
||
|
|
Subject: [PATCH 10/12] virtio-blk: Refactor the code that processes queued
|
||
|
|
requests
|
||
|
|
|
||
|
|
RH-Author: Sergio Lopez Pascual <slp@redhat.com>
|
||
|
|
Message-id: <20200624132453.111276-2-slp@redhat.com>
|
||
|
|
Patchwork-id: 97797
|
||
|
|
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 1/2] virtio-blk: Refactor the code that processes queued requests
|
||
|
|
Bugzilla:
|
||
|
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
||
|
|
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
|
||
|
|
Move the code that processes queued requests from
|
||
|
|
virtio_blk_dma_restart_bh() to its own, non-static, function. This
|
||
|
|
will allow us to call it from the virtio_blk_data_plane_start() in a
|
||
|
|
future patch.
|
||
|
|
|
||
|
|
Signed-off-by: Sergio Lopez <slp@redhat.com>
|
||
|
|
Message-Id: <20200603093240.40489-2-slp@redhat.com>
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
(cherry picked from commit 7aa1c247b466870b0704d3ccdc3755e5e7394dca)
|
||
|
|
Signed-off-by: Sergio Lopez <slp@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/block/virtio-blk.c | 16 +++++++++++-----
|
||
|
|
include/hw/virtio/virtio-blk.h | 1 +
|
||
|
|
2 files changed, 12 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
|
||
|
|
index c4e55fb3de..6ff29a05d6 100644
|
||
|
|
--- a/hw/block/virtio-blk.c
|
||
|
|
+++ b/hw/block/virtio-blk.c
|
||
|
|
@@ -819,15 +819,11 @@ static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
|
||
|
|
virtio_blk_handle_output_do(s, vq);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void virtio_blk_dma_restart_bh(void *opaque)
|
||
|
|
+void virtio_blk_process_queued_requests(VirtIOBlock *s)
|
||
|
|
{
|
||
|
|
- VirtIOBlock *s = opaque;
|
||
|
|
VirtIOBlockReq *req = s->rq;
|
||
|
|
MultiReqBuffer mrb = {};
|
||
|
|
|
||
|
|
- qemu_bh_delete(s->bh);
|
||
|
|
- s->bh = NULL;
|
||
|
|
-
|
||
|
|
s->rq = NULL;
|
||
|
|
|
||
|
|
aio_context_acquire(blk_get_aio_context(s->conf.conf.blk));
|
||
|
|
@@ -855,6 +851,16 @@ static void virtio_blk_dma_restart_bh(void *opaque)
|
||
|
|
aio_context_release(blk_get_aio_context(s->conf.conf.blk));
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void virtio_blk_dma_restart_bh(void *opaque)
|
||
|
|
+{
|
||
|
|
+ VirtIOBlock *s = opaque;
|
||
|
|
+
|
||
|
|
+ qemu_bh_delete(s->bh);
|
||
|
|
+ s->bh = NULL;
|
||
|
|
+
|
||
|
|
+ virtio_blk_process_queued_requests(s);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static void virtio_blk_dma_restart_cb(void *opaque, int running,
|
||
|
|
RunState state)
|
||
|
|
{
|
||
|
|
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
|
||
|
|
index cddcfbebe9..cf8eea2f58 100644
|
||
|
|
--- a/include/hw/virtio/virtio-blk.h
|
||
|
|
+++ b/include/hw/virtio/virtio-blk.h
|
||
|
|
@@ -84,5 +84,6 @@ typedef struct MultiReqBuffer {
|
||
|
|
} MultiReqBuffer;
|
||
|
|
|
||
|
|
bool virtio_blk_handle_vq(VirtIOBlock *s, VirtQueue *vq);
|
||
|
|
+void virtio_blk_process_queued_requests(VirtIOBlock *s);
|
||
|
|
|
||
|
|
#endif
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|