[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] virtio-scsi: convert to virtqueue_map
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH 5/6] virtio-scsi: convert to virtqueue_map |
Date: |
Tue, 27 Oct 2015 10:48:06 +0200 |
Note: virtqueue_map already validates input
so virtio-scsi does not have to.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/scsi/virtio-scsi.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 1c33f14..33bd25a 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -207,20 +207,8 @@ static void *virtio_scsi_load_request(QEMUFile *f,
SCSIRequest *sreq)
assert(n < vs->conf.num_queues);
req = virtio_scsi_init_req(s, vs->cmd_vqs[n]);
qemu_get_buffer(f, (unsigned char *)&req->elem, sizeof(req->elem));
- /* TODO: add a way for SCSIBusInfo's load_request to fail,
- * and fail migration instead of asserting here.
- * When we do, we might be able to re-enable NDEBUG below.
- */
-#ifdef NDEBUG
-#error building with NDEBUG is not supported
-#endif
- 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);
+
+ virtqueue_map(&req->elem);
if (virtio_scsi_parse_req(req, sizeof(VirtIOSCSICmdReq) + vs->cdb_size,
sizeof(VirtIOSCSICmdResp) + vs->sense_size) < 0)
{
--
MST
- Re: [Qemu-devel] [PATCH 1/6] virtio: introduce virtio_map, (continued)
Re: [Qemu-devel] [PATCH 1/6] virtio: introduce virtio_map, Igor Mammedov, 2015/10/28
Re: [Qemu-devel] [PATCH 1/6] virtio: introduce virtio_map, Igor Mammedov, 2015/10/28
[Qemu-devel] [PATCH 2/6] virtio: switch to virtio_map, Michael S. Tsirkin, 2015/10/27
[Qemu-devel] [PATCH 4/6] virtio-serial: convert to virtio_map, Michael S. Tsirkin, 2015/10/27
[Qemu-devel] [PATCH 3/6] virtio-blk: convert to virtqueue_map, Michael S. Tsirkin, 2015/10/27
[Qemu-devel] [PATCH 5/6] virtio-scsi: convert to virtqueue_map,
Michael S. Tsirkin <=
[Qemu-devel] [PATCH 6/6] virtio: drop virtqueue_map_sg, Michael S. Tsirkin, 2015/10/27
Re: [Qemu-devel] [PATCH 0/6] virtio: handle non contigious s/g entries, Michael S. Tsirkin, 2015/10/27
Re: [Qemu-devel] [PATCH 0/6] virtio: handle non contigious s/g entries, Michael S. Tsirkin, 2015/10/27
Re: [Qemu-devel] [PATCH 0/6] virtio: handle non contigious s/g entries, Cornelia Huck, 2015/10/27