From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKruc-0005Cy-8F for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKrua-0004Pd-Lq for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKrua-0004PN-57 for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:24 -0400 From: Kevin Wolf Date: Mon, 31 Oct 2011 14:30:15 +0100 Message-Id: <1320067830-12093-41-git-send-email-kwolf@redhat.com> In-Reply-To: <1320067830-12093-1-git-send-email-kwolf@redhat.com> References: <1320067830-12093-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 40/55] scsi-generic: remove scsi_req_fixup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini This is not needed anymore, since asynchronous ioctls were introduced by commit 221f715 (new scsi-generic abstraction, use SG_IO, 2009-03-28). Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/scsi-generic.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 4af0f24..5ef4825 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -232,19 +232,6 @@ static uint8_t *scsi_get_buf(SCSIRequest *req) return r->buf; } -static void scsi_req_fixup(SCSIRequest *req) -{ - switch(req->cmd.buf[0]) { - case REWIND: - case START_STOP: - if (req->dev->type == TYPE_TAPE) { - /* force IMMED, otherwise qemu waits end of command */ - req->cmd.buf[1] = 0x01; - } - break; - } -} - /* Execute a scsi command. Returns the length of the data expected by the command. This will be Positive for data transfers from the device (eg. disk reads), negative for transfers to the device (eg. disk writes), @@ -256,8 +243,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) SCSIDevice *s = r->req.dev; int ret; - scsi_req_fixup(&r->req); - DPRINTF("Command: lun=%d tag=0x%x len %zd data=0x%02x", lun, tag, r->req.cmd.xfer, cmd[0]); -- 1.7.6.4