From patchwork Thu Apr 19 14:29:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 153823 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 037EEB6FDF for ; Fri, 20 Apr 2012 01:53:25 +1000 (EST) Received: from localhost ([::1]:37491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKsO1-0000tC-NA for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 10:31:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKsNM-00083A-JM for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKsNH-00054p-PQ for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:24 -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 1SKsNH-0004Mc-Gv for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:19 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so12014088pbc.4 for ; Thu, 19 Apr 2012 07:30:18 -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=EEzNxsVh+zEjdB3h3EwyELSGV5XSwsNqBmVUAG6nXV4=; b=GjO1jI7lAP4HWAomq90RORCU/Ps9QcpeCSKvsNpsi966WbA73JXDVJi5E7QP6rV55S 0hvyfoagNaJyXKQiOhbv9nm1VlCZ5zMVlzwKPCNRakpOIO9vgfDSqSEpJWgVV056RcGm mT4BcBxq7CNMZG5q/ilQbW86SblNL3+Hn+8bcm/DMbLga9FXluVGBvaoWnvqp4yt+fd4 1eJfw4a21C52ZS0A+5hvq3p09B3pLwlbDclmugot+FgQi2/J7RE2JX8MqFhuMNtWggn6 HJDCWdb8drXz8tRWmpTItYb19T2ljgPRwrXi6qd2Va9kF02BHj4OyOOREWvY7jFffonp V22w== Received: by 10.68.219.226 with SMTP id pr2mr5182019pbc.66.1334845818670; Thu, 19 Apr 2012 07:30:18 -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.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 07:30:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 16:29:30 +0200 Message-Id: <1334845776-11664-11-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 10/16] scsi: add a started field to SCSIDiskReq 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 Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 09c2715..428d831 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -55,6 +55,7 @@ typedef struct SCSIDiskReq { uint64_t sector; uint32_t sector_count; uint32_t buflen; + bool started; struct iovec iov; QEMUIOVector qiov; BlockAcctCookie acct; @@ -287,6 +288,7 @@ static void scsi_read_data(SCSIRequest *req) 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; } @@ -313,6 +315,7 @@ static void scsi_read_data(SCSIRequest *req) return; } + r->started = true; if (r->req.sg) { dma_acct_start(s->qdev.conf.bs, &r->acct, r->req.sg, BDRV_ACCT_READ); r->req.resid -= r->req.sg->size; @@ -425,6 +428,7 @@ static void scsi_write_data(SCSIRequest *req) if (!r->req.sg && !r->qiov.size) { /* Called for the first time. Ask the driver to send us more data. */ + r->started = true; scsi_write_complete(r, 0); return; }