From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 16 Mar 2012 17:54:46 +0000 (+0100)
Subject: virtio-scsi: Fix virtio-scsi after cdb_is_read changes.
X-Git-Tag: rel-1.7.0~8
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8c313078917099a002d45f58d58ae2f4eb9a657f;p=seabios.git

virtio-scsi: Fix virtio-scsi after cdb_is_read changes.

The previous patch changes the way TEST_UNIT_READY is composed in the
buffers and breaks virtio-scsi.
---

diff --git a/src/virtio-scsi.c b/src/virtio-scsi.c
index 50339d7..ab74729 100644
--- a/src/virtio-scsi.c
+++ b/src/virtio-scsi.c
@@ -46,9 +46,8 @@ virtio_scsi_cmd(u16 ioaddr, struct vring_virtqueue *vq, struct disk_op_s *op,
 
     u32 len = op->count * blocksize;
     int datain = cdb_is_read(cdbcmd, blocksize);
-    int data_idx = (datain ? 2 : 1);
-    int out_num = (datain ? 1 : 2);
-    int in_num = (len ? 3 : 2) - out_num;
+    int in_num = (datain ? 2 : 1);
+    int out_num = (len ? 3 : 2) - in_num;
 
     sg[0].addr   = MAKE_FLATPTR(GET_SEG(SS), &req);
     sg[0].length = sizeof(req);
@@ -56,8 +55,11 @@ virtio_scsi_cmd(u16 ioaddr, struct vring_virtqueue *vq, struct disk_op_s *op,
     sg[out_num].addr   = MAKE_FLATPTR(GET_SEG(SS), &resp);
     sg[out_num].length = sizeof(resp);
 
-    sg[data_idx].addr   = op->buf_fl;
-    sg[data_idx].length = len;
+    if (len) {
+        int data_idx = (datain ? 2 : 1);
+        sg[data_idx].addr   = op->buf_fl;
+        sg[data_idx].length = len;
+    }
 
     /* Add to virtqueue and kick host */
     vring_add_buf(vq, sg, out_num, in_num, 0, 0);