virtio-blk: Fix migration of queued requests
authorKevin Wolf <kwolf@redhat.com>
Tue, 3 Aug 2010 14:57:02 +0000 (16:57 +0200)
committerKevin Wolf <kwolf@redhat.com>
Mon, 30 Aug 2010 16:29:22 +0000 (18:29 +0200)
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 <kwolf@redhat.com>
hw/virtio-blk.c

index c3a73438f94020308a023cd92c846b14a2cbc29b..395eb9a0688d285287efe744696287b7de2a228a 100644 (file)
@@ -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;