From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56215 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtL2c-0004mZ-F0 for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:50:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtKiR-0005XZ-O9 for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:29:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10425) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtKiR-0005XS-FQ for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:29:31 -0400 From: Kevin Wolf Date: Wed, 8 Sep 2010 15:29:19 +0200 Message-Id: <1283952582-17498-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1283952582-17498-1-git-send-email-kwolf@redhat.com> References: <1283952582-17498-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 02/25] virtio-blk: Fix migration of queued requests List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org in_sg[].iovec and out_sg[].ioved are pointer to (source) host memory and therefore invalid after migration. When loading the device state we must create a new mapping on the destination host. Signed-off-by: Kevin Wolf --- hw/virtio-blk.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index c3a7343..395eb9a 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -481,6 +481,11 @@ static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, (unsigned char*)&req->elem, sizeof(req->elem)); req->next = s->rq; s->rq = req; + + virtqueue_map_sg(req->elem.in_sg, req->elem.in_addr, + req->elem.in_num, 1); + virtqueue_map_sg(req->elem.out_sg, req->elem.out_addr, + req->elem.out_num, 0); } return 0; -- 1.7.2.2