Patchwork [STABLE,0.13,2/6] virtio-blk: Fix migration of queued requests

login
register
mail settings
Submitter Kevin Wolf
Date Aug. 30, 2010, 4:53 p.m.
Message ID <1283187233-3925-3-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/63120/
State New
Headers show

Comments

Kevin Wolf - Aug. 30, 2010, 4:53 p.m.
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)
---
 hw/virtio-blk.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Patch

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;