[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/7] virtio-blk: associate request with a virtque
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 4/7] virtio-blk: associate request with a virtqueue |
Date: |
Tue, 7 Jun 2016 17:28:28 +0100 |
Multiqueue requires that each request knows to which virtqueue it
belongs.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/block/virtio-blk.c | 20 +++++++++++---------
include/hw/virtio/virtio-blk.h | 4 +++-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index fa05e41..222611c 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -29,9 +29,11 @@
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio-access.h"
-void virtio_blk_init_request(VirtIOBlock *s, VirtIOBlockReq *req)
+void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
+ VirtIOBlockReq *req)
{
req->dev = s;
+ req->vq = vq;
req->qiov.size = 0;
req->in_len = 0;
req->next = NULL;
@@ -53,11 +55,11 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req,
unsigned char status)
trace_virtio_blk_req_complete(req, status);
stb_p(&req->in->status, status);
- virtqueue_push(s->vq, &req->elem, req->in_len);
+ virtqueue_push(req->vq, &req->elem, req->in_len);
if (s->dataplane_started && !s->dataplane_disabled) {
- virtio_blk_data_plane_notify(s->dataplane, s->vq);
+ virtio_blk_data_plane_notify(s->dataplane, req->vq);
} else {
- virtio_notify(vdev, s->vq);
+ virtio_notify(vdev, req->vq);
}
}
@@ -187,12 +189,12 @@ out:
#endif
-static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s)
+static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s, VirtQueue *vq)
{
- VirtIOBlockReq *req = virtqueue_pop(s->vq, sizeof(VirtIOBlockReq));
+ VirtIOBlockReq *req = virtqueue_pop(vq, sizeof(VirtIOBlockReq));
if (req) {
- virtio_blk_init_request(s, req);
+ virtio_blk_init_request(s, vq, req);
}
return req;
}
@@ -583,7 +585,7 @@ void virtio_blk_handle_vq(VirtIOBlock *s, VirtQueue *vq)
blk_io_plug(s->blk);
- while ((req = virtio_blk_get_request(s))) {
+ while ((req = virtio_blk_get_request(s, vq))) {
virtio_blk_handle_request(req, &mrb);
}
@@ -836,7 +838,7 @@ static int virtio_blk_load_device(VirtIODevice *vdev,
QEMUFile *f,
while (qemu_get_sbyte(f)) {
VirtIOBlockReq *req;
req = qemu_get_virtqueue_element(f, sizeof(VirtIOBlockReq));
- virtio_blk_init_request(s, req);
+ virtio_blk_init_request(s, s->vq, req);
req->next = s->rq;
s->rq = req;
}
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index 9b03b6a..a25b344 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -63,6 +63,7 @@ typedef struct VirtIOBlockReq {
VirtQueueElement elem;
int64_t sector_num;
VirtIOBlock *dev;
+ VirtQueue *vq;
struct virtio_blk_inhdr *in;
struct virtio_blk_outhdr out;
QEMUIOVector qiov;
@@ -80,7 +81,8 @@ typedef struct MultiReqBuffer {
bool is_write;
} MultiReqBuffer;
-void virtio_blk_init_request(VirtIOBlock *s, VirtIOBlockReq *req);
+void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
+ VirtIOBlockReq *req);
void virtio_blk_free_request(VirtIOBlockReq *req);
void virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb);
--
2.5.5
- [Qemu-devel] [PATCH v3 0/7] virtio-blk: multiqueue support, Stefan Hajnoczi, 2016/06/08
- [Qemu-devel] [PATCH v3 3/7] virtio-blk: tell dataplane which vq to notify, Stefan Hajnoczi, 2016/06/08
- [Qemu-devel] [PATCH v3 4/7] virtio-blk: associate request with a virtqueue,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 2/7] virtio-blk: multiqueue batch notify, Stefan Hajnoczi, 2016/06/08
- [Qemu-devel] [PATCH v3 1/7] virtio-blk: add VirtIOBlockConf->num_queues, Stefan Hajnoczi, 2016/06/08
- [Qemu-devel] [PATCH v3 5/7] virtio-blk: live migrate s->rq with multiqueue, Stefan Hajnoczi, 2016/06/08
- [Qemu-devel] [PATCH v3 6/7] virtio-blk: dataplane multiqueue support, Stefan Hajnoczi, 2016/06/08
- [Qemu-devel] [PATCH v3 7/7] virtio-blk: add num-queues device property, Stefan Hajnoczi, 2016/06/08
- Re: [Qemu-devel] [PATCH v3 0/7] virtio-blk: multiqueue support, Stefan Hajnoczi, 2016/06/20