From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlzCe-0002yW-Mg for qemu-devel@nongnu.org; Thu, 28 Nov 2013 05:52:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlzCZ-0004XF-IW for qemu-devel@nongnu.org; Thu, 28 Nov 2013 05:52:12 -0500 From: Paolo Bonzini Date: Thu, 28 Nov 2013 11:51:59 +0100 Message-Id: <1385635920-9374-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1385635920-9374-1-git-send-email-pbonzini@redhat.com> References: <1385635920-9374-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] scsi-bus: fix transfer length and direction for VERIFY command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org The amount of bytes to transfer depends on the BYTCHK field. If any data is transferred, it is sent to the device. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-bus.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 18a0399..55aef9b 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -851,7 +851,6 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf) case RELEASE: case ERASE: case ALLOW_MEDIUM_REMOVAL: - case VERIFY_10: case SEEK_10: case SYNCHRONIZE_CACHE: case SYNCHRONIZE_CACHE_16: @@ -868,6 +867,15 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf) case ALLOW_OVERWRITE: cmd->xfer = 0; break; + case VERIFY_10: + case VERIFY_12: + case VERIFY_16: + if ((buf[1] & 2) == 0) { + cmd->xfer = 0; + } else if ((buf[1] & 4) == 1) { + cmd->xfer = dev->blocksize; + } + break; case MODE_SENSE: break; case WRITE_SAME_10: @@ -1065,6 +1073,9 @@ static void scsi_cmd_xfer_mode(SCSICommand *cmd) case WRITE_VERIFY_12: case WRITE_16: case WRITE_VERIFY_16: + case VERIFY_10: + case VERIFY_12: + case VERIFY_16: case COPY: case COPY_VERIFY: case COMPARE: -- 1.8.4.2