From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REJ5t-0006nS-HO for qemu-devel@nongnu.org; Thu, 13 Oct 2011 07:04:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1REJ5q-0004HF-Nx for qemu-devel@nongnu.org; Thu, 13 Oct 2011 07:04:57 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:64907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REJ5q-0004Dt-Iu for qemu-devel@nongnu.org; Thu, 13 Oct 2011 07:04:54 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so1336631wwg.10 for ; Thu, 13 Oct 2011 04:04:54 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 13 Oct 2011 13:03:54 +0200 Message-Id: <1318503845-11473-25-git-send-email-pbonzini@redhat.com> In-Reply-To: <1318503845-11473-1-git-send-email-pbonzini@redhat.com> References: <1318503845-11473-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 24/35] scsi-generic: remove scsi_req_fixup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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 cea4fca..da104a6 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -233,19 +233,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), @@ -257,8 +244,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