From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SobEB-000364-0v for qemu-devel@nongnu.org; Tue, 10 Jul 2012 10:15:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SobE1-0002Ct-Jh for qemu-devel@nongnu.org; Tue, 10 Jul 2012 10:15:46 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:59253) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SobE1-00025c-Ax for qemu-devel@nongnu.org; Tue, 10 Jul 2012 10:15:37 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so369507pbb.4 for ; Tue, 10 Jul 2012 07:15:36 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 10 Jul 2012 16:15:06 +0200 Message-Id: <1341929710-21574-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1341929710-21574-1-git-send-email-pbonzini@redhat.com> References: <1341929710-21574-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/8] scsi-disk: separate read_data/write_data implementation for emulate_reqops List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The previous patch only separated the send_command callback. Use different implementations also for read_data and write_data. The latter is still unreachable, so it aborts for now. read_data passes the data buffer that was prepared and completes the command. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 136b813..a03d200 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -342,13 +342,6 @@ static void scsi_read_data(SCSIRequest *req) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); bool first; - if (r->sector_count == (uint32_t)-1) { - DPRINTF("Read buf_len=%zd\n", r->iov.iov_len); - r->sector_count = 0; - r->started = true; - scsi_req_data(&r->req, r->iov.iov_len); - return; - } DPRINTF("Read sector_count=%d\n", r->sector_count); if (r->sector_count == 0) { /* This also clears the sense buffer for REQUEST SENSE. */ @@ -1266,6 +1259,28 @@ static int scsi_disk_emulate_start_stop(SCSIDiskReq *r) return 0; } +static void scsi_disk_emulate_read_data(SCSIRequest *req) +{ + SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); + int buflen = r->iov.iov_len; + + if (buflen) { + DPRINTF("Read buf_len=%zd\n", buflen); + r->iov.iov_len = 0; + r->started = true; + scsi_req_data(&r->req, buflen); + return; + } + + /* This also clears the sense buffer for REQUEST SENSE. */ + scsi_req_complete(&r->req, GOOD); +} + +static void scsi_disk_emulate_write_data(SCSIRequest *req) +{ + abort(); +} + static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) { SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); @@ -1536,9 +1551,8 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE)); return 0; } - assert(!r->req.aiocb && r->sector_count == 0); + assert(!r->req.aiocb); r->iov.iov_len = MIN(buflen, req->cmd.xfer); - r->sector_count = -1; if (r->iov.iov_len == 0) { scsi_req_complete(&r->req, GOOD); } @@ -1793,8 +1807,8 @@ static const SCSIReqOps scsi_disk_emulate_reqops = { .size = sizeof(SCSIDiskReq), .free_req = scsi_free_request, .send_command = scsi_disk_emulate_command, - .read_data = scsi_read_data, - .write_data = scsi_write_data, + .read_data = scsi_disk_emulate_read_data, + .write_data = scsi_disk_emulate_write_data, .get_buf = scsi_get_buf, }; -- 1.7.10.4