From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QocAp-00010z-QA for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QocAi-0007cv-8D for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QocAh-0007bu-Rs for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:44 -0400 From: Kevin Wolf Date: Wed, 3 Aug 2011 16:14:05 +0200 Message-Id: <1312380864-15605-11-git-send-email-kwolf@redhat.com> In-Reply-To: <1312380864-15605-1-git-send-email-kwolf@redhat.com> References: <1312380864-15605-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 10/29] scsi: Remove REZERO_UNIT emulation 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: Hannes Reinecke REZERO_UNIT command is obsolete. Remove support for it. Signed-off-by: Hannes Reinecke Signed-off-by: Kevin Wolf --- hw/scsi-bus.c | 3 --- hw/scsi-defs.h | 1 - hw/scsi-disk.c | 7 ------- 3 files changed, 0 insertions(+), 11 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index facc98d..52a6784 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -223,7 +223,6 @@ static int scsi_req_length(SCSIRequest *req, uint8_t *cmd) switch(cmd[0]) { case TEST_UNIT_READY: - case REZERO_UNIT: case START_STOP: case SEEK_6: case WRITE_FILEMARKS: @@ -516,8 +515,6 @@ static const char *scsi_command_name(uint8_t cmd) { static const char *names[] = { [ TEST_UNIT_READY ] = "TEST_UNIT_READY", - [ REZERO_UNIT ] = "REZERO_UNIT", - /* REWIND and REZERO_UNIT use the same operation code */ [ REQUEST_SENSE ] = "REQUEST_SENSE", [ FORMAT_UNIT ] = "FORMAT_UNIT", [ READ_BLOCK_LIMITS ] = "READ_BLOCK_LIMITS", diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h index 8513983..1f40c5c 100644 --- a/hw/scsi-defs.h +++ b/hw/scsi-defs.h @@ -25,7 +25,6 @@ */ #define TEST_UNIT_READY 0x00 -#define REZERO_UNIT 0x01 #define REQUEST_SENSE 0x03 #define FORMAT_UNIT 0x04 #define READ_BLOCK_LIMITS 0x05 diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 715f2cd..abf0bd2 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -972,12 +972,6 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) break; case VERIFY: break; - case REZERO_UNIT: - DPRINTF("Rezero Unit\n"); - if (!bdrv_is_inserted(s->bs)) { - goto not_ready; - } - break; default: scsi_command_complete(r, CHECK_CONDITION, SENSE_CODE(INVALID_OPCODE)); return -1; @@ -1059,7 +1053,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) case SERVICE_ACTION_IN: case REPORT_LUNS: case VERIFY: - case REZERO_UNIT: rc = scsi_disk_emulate_command(r, outbuf); if (rc < 0) { return 0; -- 1.7.6