aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-08-03 16:57:02 +0200
committerKevin Wolf <kwolf@redhat.com>2010-08-30 18:38:36 +0200
commit55ee7b38e820601e9e226061f1b68f9275553ec5 (patch)
treeefcdf15df08ffe930d6b2d369bc8f17a56ce9696
parent6674dc4269030567dd6c463b7eedc8a5b9ad1888 (diff)
virtio-blk: Fix migration of queued requests
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> (cherry picked from commit b6a4805b55b409134dc712677fdc4f6a8795e965)
-rw-r--r--hw/virtio-blk.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 490cd41050..251779ca7a 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;