From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 30 Oct 2012 16:31:43 +0000 (+0100)
Subject: virtio-scsi: use dma_context_memory
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dd72fdd06268860a24f9f3828efade547ee2e2a9;p=qemu.git

virtio-scsi: use dma_context_memory

Until address_space_rw was introduced, NULL was accepted as a
placeholder for DMA with no IOMMU (to address_space_memory).

This does not work anymore, and dma_context_memory needs to
be specified explicitly.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c
index 30d3f8aca7..7d546f6ca7 100644
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -204,7 +204,7 @@ static void virtio_scsi_bad_req(void)
 static void qemu_sgl_init_external(QEMUSGList *qsgl, struct iovec *sg,
                                    hwaddr *addr, int num)
 {
-    memset(qsgl, 0, sizeof(*qsgl));
+    qemu_sglist_init(qsgl, num, &dma_context_memory);
     while (num--) {
         qemu_sglist_add(qsgl, *(addr++), (sg++)->iov_len);
     }