[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/8] virtio-blk: live migrateion s->rq with multi
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v2 6/8] virtio-blk: live migrateion s->rq with multiqueue |
Date: |
Mon, 30 May 2016 18:26:04 -0700 |
Add a field for the virtqueue index when migrating the s->rq request
list. The new field is only needed when num_queues > 1. Existing QEMUs
are unaffected by this change and therefore virtio-blk migration stays
compatible.
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/block/virtio-blk.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 9de749b..f36b690 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -873,6 +873,11 @@ static void virtio_blk_save_device(VirtIODevice *vdev,
QEMUFile *f)
while (req) {
qemu_put_sbyte(f, 1);
+
+ if (s->conf.num_queues > 1) {
+ qemu_put_be32(f, virtio_queue_get_id(req->vq));
+ }
+
qemu_put_virtqueue_element(f, &req->elem);
req = req->next;
}
@@ -896,9 +901,22 @@ static int virtio_blk_load_device(VirtIODevice *vdev,
QEMUFile *f,
VirtIOBlock *s = VIRTIO_BLK(vdev);
while (qemu_get_sbyte(f)) {
+ unsigned nvqs = s->conf.num_queues;
+ unsigned vq_idx = 0;
VirtIOBlockReq *req;
+
+ if (nvqs > 1) {
+ vq_idx = qemu_get_be32(f);
+
+ if (vq_idx >= nvqs) {
+ error_report("Invalid virtqueue index in request list: %#x",
+ vq_idx);
+ return -EINVAL;
+ }
+ }
+
req = qemu_get_virtqueue_element(f, sizeof(VirtIOBlockReq));
- virtio_blk_init_request(s, s->vq, req);
+ virtio_blk_init_request(s, virtio_get_queue(vdev, vq_idx), req);
req->next = s->rq;
s->rq = req;
}
--
2.5.5
- [Qemu-devel] [PATCH v2 0/8] virtio-blk: multiqueue support, Stefan Hajnoczi, 2016/05/30
- [Qemu-devel] [PATCH v2 1/8] virtio-blk: use batch notify in non-dataplane case, Stefan Hajnoczi, 2016/05/30
- [Qemu-devel] [PATCH v2 2/8] virtio-blk: tell dataplane which vq to notify, Stefan Hajnoczi, 2016/05/30
- [Qemu-devel] [PATCH v2 3/8] virtio-blk: associate request with a virtqueue, Stefan Hajnoczi, 2016/05/30
- [Qemu-devel] [PATCH v2 4/8] virtio-blk: add VirtIOBlockConf->num_queues, Stefan Hajnoczi, 2016/05/30
- [Qemu-devel] [PATCH v2 5/8] virtio-blk: multiqueue batch notify, Stefan Hajnoczi, 2016/05/30
- [Qemu-devel] [PATCH v2 6/8] virtio-blk: live migrateion s->rq with multiqueue,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v2 7/8] virtio-blk: dataplane multiqueue support, Stefan Hajnoczi, 2016/05/30
- [Qemu-devel] [PATCH v2 8/8] virtio-blk: add num-queues device property, Stefan Hajnoczi, 2016/05/30