From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKnh8-0005iw-VS for qemu-devel@nongnu.org; Thu, 30 Jul 2015 09:16:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKnh3-0004BT-Dd for qemu-devel@nongnu.org; Thu, 30 Jul 2015 09:16:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKnh3-0004BN-9Q for qemu-devel@nongnu.org; Thu, 30 Jul 2015 09:16:17 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 0897EA2C09 for ; Thu, 30 Jul 2015 13:16:17 +0000 (UTC) From: Stefan Hajnoczi Date: Thu, 30 Jul 2015 14:16:11 +0100 Message-Id: <1438262173-11546-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1438262173-11546-1-git-send-email-stefanha@redhat.com> References: <1438262173-11546-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH for-2.4 1/3] virtio-scsi: use virtqueue_map_sg() when loading requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi The VirtQueueElement struct is serialized during migration but the in_sg[]/out_sg[] iovec arrays are not usable on the destination host because the pointers are meaningless. Use virtqueue_map_sg() to refresh in_sg[]/out_sg[] to valid pointers based on in_addr[]/out_addr[] hwaddrs. Cc: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- hw/scsi/virtio-scsi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 811c3da..a8bb1c6 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -217,6 +217,11 @@ static void *virtio_scsi_load_request(QEMUFile *f, SCSIRequest *sreq) assert(req->elem.in_num <= ARRAY_SIZE(req->elem.in_sg)); assert(req->elem.out_num <= ARRAY_SIZE(req->elem.out_sg)); + 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); + if (virtio_scsi_parse_req(req, sizeof(VirtIOSCSICmdReq) + vs->cdb_size, sizeof(VirtIOSCSICmdResp) + vs->sense_size) < 0) { error_report("invalid SCSI request migration data"); -- 2.4.3