From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49088 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OgIzS-0001MD-Ui for qemu-devel@nongnu.org; Tue, 03 Aug 2010 11:01:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OgIzQ-0007fv-SW for qemu-devel@nongnu.org; Tue, 03 Aug 2010 11:01:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11176) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OgIzQ-0007fn-FZ for qemu-devel@nongnu.org; Tue, 03 Aug 2010 11:01:12 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o73F1BCm028055 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 3 Aug 2010 11:01:11 -0400 From: Kevin Wolf Date: Tue, 3 Aug 2010 17:01:12 +0200 Message-Id: <1280847672-28701-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1280847672-28701-1-git-send-email-kwolf@redhat.com> References: <1280847672-28701-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] virtio-blk: Fix migration of queued requests List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com 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 490cd41..251779c 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -480,6 +480,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