From patchwork Tue Nov 17 10:17:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 38615 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4461CB70CF for ; Tue, 17 Nov 2009 21:44:40 +1100 (EST) Received: from localhost ([127.0.0.1]:40973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NALY4-0000c7-Bq for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 05:44:36 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAL8c-0000MH-MU for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:20 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAL8V-0000H9-OD for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:15 -0500 Received: from [199.232.76.173] (port=58255 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAL8V-0000Gm-48 for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11310) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAL8U-0006xm-Km for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:10 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHAI9hd023545 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 05:18:09 -0500 Received: from zweiblum.home.kraxel.org (vpn1-7-195.ams2.redhat.com [10.36.7.195]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAHAI1EF030450; Tue, 17 Nov 2009 05:18:02 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 4519270064; Tue, 17 Nov 2009 11:17:52 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 11:17:46 +0100 Message-Id: <1258453071-3496-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1258453071-3496-1-git-send-email-kraxel@redhat.com> References: <1258453071-3496-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 10/15] scsi: use command defines in scsi-disk.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann Reviewed-by: Christoph Hellwig --- hw/scsi-disk.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 25f8eaa..2068187 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -398,16 +398,16 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, if (lun || buf[1] >> 5) { /* Only LUN 0 supported. */ DPRINTF("Unimplemented LUN %d\n", lun ? lun : buf[1] >> 5); - if (command != 0x03 && command != 0x12) /* REQUEST SENSE and INQUIRY */ + if (command != REQUEST_SENSE && command != INQUIRY) goto fail; } switch (command) { - case 0x0: + case TEST_UNIT_READY: DPRINTF("Test Unit Ready\n"); if (!bdrv_is_inserted(s->dinfo->bdrv)) goto notready; break; - case 0x03: + case REQUEST_SENSE: DPRINTF("Request Sense (len %d)\n", len); if (len < 4) goto fail; @@ -425,7 +425,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, outbuf[1] = 0; outbuf[2] = s->sense; break; - case 0x12: + case INQUIRY: DPRINTF("Inquiry (len %d)\n", len); if (buf[1] & 0x2) { /* Command support data - optional, not implemented */ @@ -581,18 +581,18 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, outbuf[7] = 0x10 | (r->req.bus->tcq ? 0x02 : 0); r->iov.iov_len = len; break; - case 0x16: + case RESERVE: DPRINTF("Reserve(6)\n"); if (buf[1] & 1) goto fail; break; - case 0x17: + case RELEASE: DPRINTF("Release(6)\n"); if (buf[1] & 1) goto fail; break; - case 0x1a: - case 0x5a: + case MODE_SENSE: + case MODE_SENSE_10: { uint8_t *p; int page; @@ -743,18 +743,18 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, r->iov.iov_len = len; } break; - case 0x1b: + case START_STOP: DPRINTF("Start Stop Unit\n"); if (bdrv_get_type_hint(s->dinfo->bdrv) == BDRV_TYPE_CDROM && (buf[4] & 2)) /* load/eject medium */ bdrv_eject(s->dinfo->bdrv, !(buf[4] & 1)); break; - case 0x1e: + case ALLOW_MEDIUM_REMOVAL: DPRINTF("Prevent Allow Medium Removal (prevent = %d)\n", buf[4] & 3); bdrv_set_locked(s->dinfo->bdrv, buf[4] & 1); break; - case 0x25: + case READ_CAPACITY: DPRINTF("Read Capacity\n"); /* The normal LEN field for this command is zero. */ memset(outbuf, 0, 8); @@ -783,8 +783,8 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, return 0; } break; - case 0x08: - case 0x28: + case READ_6: + case READ_10: case 0x88: DPRINTF("Read (sector %" PRId64 ", count %d)\n", lba, len); if (lba > s->max_lba) @@ -792,8 +792,8 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, r->sector = lba * s->cluster_size; r->sector_count = len * s->cluster_size; break; - case 0x0a: - case 0x2a: + case WRITE_6: + case WRITE_10: case 0x8a: DPRINTF("Write (sector %" PRId64 ", count %d)\n", lba, len); if (lba > s->max_lba) @@ -802,11 +802,11 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, r->sector_count = len * s->cluster_size; is_write = 1; break; - case 0x35: + case SYNCHRONIZE_CACHE: DPRINTF("Synchronise cache (sector %" PRId64 ", count %d)\n", lba, len); bdrv_flush(s->dinfo->bdrv); break; - case 0x43: + case READ_TOC: { int start_track, format, msf, toclen; @@ -852,12 +852,12 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, outbuf[7] = 8; // CD-ROM r->iov.iov_len = 8; break; - case 0x56: + case RESERVE_10: DPRINTF("Reserve(10)\n"); if (buf[1] & 3) goto fail; break; - case 0x57: + case RELEASE_10: DPRINTF("Release(10)\n"); if (buf[1] & 3) goto fail; @@ -904,7 +904,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, outbuf[3] = 8; r->iov.iov_len = 16; break; - case 0x2f: + case VERIFY: DPRINTF("Verify (sector %" PRId64 ", count %d)\n", lba, len); break; default: