From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFKYg-0006ZW-1D for qemu-devel@nongnu.org; Tue, 21 Jun 2016 08:13:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFKYf-0006Ko-2B for qemu-devel@nongnu.org; Tue, 21 Jun 2016 08:13:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFKYe-0006Ki-SD for qemu-devel@nongnu.org; Tue, 21 Jun 2016 08:13:32 -0400 From: Stefan Hajnoczi Date: Tue, 21 Jun 2016 13:13:14 +0100 Message-Id: <1466511196-12612-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1466511196-12612-1-git-send-email-stefanha@redhat.com> References: <1466511196-12612-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v4 5/7] virtio-blk: live migrate s->rq with multiqueue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Roman Pen , Fam Zheng , Christian Borntraeger , Paolo Bonzini , Ming Lei , Stefan Hajnoczi 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 Signed-off-by: Stefan Hajnoczi --- 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 222611c..2ea8766 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -813,6 +813,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_get_queue_index(req->vq)); + } + qemu_put_virtqueue_element(f, &req->elem); req = req->next; } @@ -836,9 +841,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