From patchwork Thu Apr 19 14:29:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 153831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 460A2B6FE2 for ; Fri, 20 Apr 2012 02:07:13 +1000 (EST) Received: from localhost ([::1]:38068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKsOI-0001Bn-Vc for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 10:31:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKsNI-0007oi-1p for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKsNE-00053N-Sx for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:19 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKsNE-0004Mc-Ks for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:16 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so12014088pbc.4 for ; Thu, 19 Apr 2012 07:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=6bptERU5BldJwCJKbnecC4GdqcZShcWObJsB3Kag2PA=; b=Az9IggBXSFem8lVWhGWFtxwUoh0wuWgjlD/Ksaiz/wPfzy0PTf53lY4xKsZjrPliE5 mMt32MiEQ7aTGXxdJSAAcbB+vHcoV0Tdme8tK+bKqy0rjF6EtJWNCx8anfRwHYUec8qu x86G01Ip/hvex2QY96jv4G3WBd0e5esuNCMSR2ig04wH4IdgSGdTskGR2KrP3MK8CC2n KjHccvLsxQ5SV5u4FyPmYjqiuPq1Tfc92zm3IlhDETBZUhQ8F8ZqikAbDnXl8OR46PQV 4ZwzXFRs0yI1zrLBOQJPuTBghw0EDzriAwYJHOct58/YIatG3QNUt6AulUELi4KbRTux o2pA== Received: by 10.68.223.33 with SMTP id qr1mr5102776pbc.47.1334845815674; Thu, 19 Apr 2012 07:30:15 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id r6sm2401487pbl.24.2012.04.19.07.30.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 07:30:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 16:29:29 +0200 Message-Id: <1334845776-11664-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.9.3 In-Reply-To: <1334845776-11664-1-git-send-email-pbonzini@redhat.com> References: <1334845776-11664-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Subject: [Qemu-devel] [PATCH 09/16] scsi: force unit access on VERIFY X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also DMA data from the host, to avoid that the host reports an underrun. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 7e6e17d..09c2715 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -185,6 +185,9 @@ static bool scsi_is_cmd_fua(SCSICommand *cmd) case WRITE_16: return (cmd->buf[1] & 8) != 0; + case VERIFY_10: + case VERIFY_12: + case VERIFY_16: case WRITE_VERIFY_10: case WRITE_VERIFY_12: case WRITE_VERIFY_16: @@ -218,7 +221,10 @@ static void scsi_dma_complete(void *opaque, int ret) SCSIDiskReq *r = (SCSIDiskReq *)opaque; SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - bdrv_acct_done(s->qdev.conf.bs, &r->acct); + if (r->req.aiocb != NULL) { + r->req.aiocb = NULL; + bdrv_acct_done(s->qdev.conf.bs, &r->acct); + } if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { @@ -427,6 +433,16 @@ static void scsi_write_data(SCSIRequest *req) return; } + if (r->req.cmd.buf[0] == VERIFY_10 || r->req.cmd.buf[0] == VERIFY_12 || + r->req.cmd.buf[0] == VERIFY_16) { + if (r->req.sg) { + scsi_dma_complete(r, 0); + } else { + scsi_write_complete(r, 0); + } + return; + } + if (r->req.sg) { dma_acct_start(s->qdev.conf.bs, &r->acct, r->req.sg, BDRV_ACCT_WRITE); r->req.resid -= r->req.sg->size; @@ -1350,8 +1366,6 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r) } DPRINTF("Unsupported Service Action In\n"); goto illegal_request; - case VERIFY_10: - break; default: scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE)); return -1; @@ -1435,7 +1449,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) case MECHANISM_STATUS: case SERVICE_ACTION_IN_16: case REQUEST_SENSE: - case VERIFY_10: rc = scsi_disk_emulate_command(r); if (rc < 0) { return 0; @@ -1461,6 +1474,9 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) r->sector = r->req.cmd.lba * (s->qdev.blocksize / 512); r->sector_count = len * (s->qdev.blocksize / 512); break; + case VERIFY_10: + case VERIFY_12: + case VERIFY_16: case WRITE_6: case WRITE_10: case WRITE_12: @@ -1811,6 +1827,9 @@ static SCSIRequest *scsi_block_new_request(SCSIDevice *d, uint32_t tag, case READ_10: case READ_12: case READ_16: + case VERIFY_10: + case VERIFY_12: + case VERIFY_16: case WRITE_6: case WRITE_10: case WRITE_12: