From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDfRC-00074h-8p for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:17 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDfR2-0006ph-1u for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:08 -0500 Received: from [199.232.76.173] (port=56171 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDfQz-0006ou-0w for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52744) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDfQy-0000IA-Mb for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:00 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAQEYx3l026249 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 26 Nov 2009 09:35:00 -0500 From: Gerd Hoffmann Date: Thu, 26 Nov 2009 15:34:15 +0100 Message-Id: <1259246056-5389-30-git-send-email-kraxel@redhat.com> In-Reply-To: <1259246056-5389-1-git-send-email-kraxel@redhat.com> References: <1259246056-5389-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 29/30] scsi-disk: restruct emulation: VERIFY List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Move VERIFY emulation from scsi_send_command() to scsi_disk_emulate_command(). Signed-off-by: Gerd Hoffmann --- hw/scsi-disk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 1507bcd..2910782 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -794,6 +794,8 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf) outbuf[3] = 8; buflen = 16; break; + case VERIFY: + break; default: goto illegal_request; } @@ -912,6 +914,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, case GET_CONFIGURATION: case SERVICE_ACTION_IN: case REPORT_LUNS: + case VERIFY: rc = scsi_disk_emulate_command(&r->req, outbuf); if (rc > 0) { r->iov.iov_len = rc; @@ -940,9 +943,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, r->sector_count = len * s->cluster_size; is_write = 1; break; - case VERIFY: - DPRINTF("Verify (sector %" PRId64 ", count %d)\n", lba, len); - break; default: DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]); fail: -- 1.6.2.5