From patchwork Tue Sep 6 07:08:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 113496 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 19D16B6F7D for ; Tue, 6 Sep 2011 17:08:59 +1000 (EST) Received: from localhost ([::1]:32948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0pm6-0007Ch-1l for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2011 03:08:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0pm0-0007Cb-6c for qemu-devel@nongnu.org; Tue, 06 Sep 2011 03:08:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0plz-00081f-3l for qemu-devel@nongnu.org; Tue, 06 Sep 2011 03:08:44 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:48145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0ply-00081Z-Vb for qemu-devel@nongnu.org; Tue, 06 Sep 2011 03:08:43 -0400 Received: by vxi32 with SMTP id 32so4683985vxi.4 for ; Tue, 06 Sep 2011 00:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer; bh=kB8Ej4wU5xuzZlpEYSWME3OnwCdICWw3Te6ZDTeOW4Y=; b=ihLvltAMmhbBvwhCMm5Mw09Y1wXkwAJ47eGJ5njDdCXVvj45TrtriDWUYkoqL9MCQW jG9PqUga4o31ohz0FxY27ETRMr/6SSjB4hdXsGCedkIwc4saKcUQr4542vfQLyaTmPvn dvY9tvXr99pfIs0/yzzDuqDBXhAj/6UPNDYFw= Received: by 10.52.33.20 with SMTP id n20mr1366268vdi.273.1315292922490; Tue, 06 Sep 2011 00:08:42 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it [93.34.199.31]) by mx.google.com with ESMTPS id e7sm6744438vdh.25.2011.09.06.00.08.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Sep 2011 00:08:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Sep 2011 09:08:34 +0200 Message-Id: <1315292914-22535-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.220.173 Subject: [Qemu-devel] [PATCH] scsi: execute SYNCHRONIZE_CACHE asynchronously 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 | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 3ffd536..c23c2b8 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -130,6 +130,24 @@ static void scsi_read_complete(void * opaque, int ret) scsi_req_data(&r->req, r->iov.iov_len); } +static void scsi_flush_complete(void * opaque, int ret) +{ + SCSIDiskReq *r = (SCSIDiskReq *)opaque; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + + if (r->req.aiocb != NULL) { + r->req.aiocb = NULL; + bdrv_acct_done(s->bs, &r->acct); + } + + if (ret < 0) { + if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_FLUSH)) { + return; + } + } + + scsi_req_complete(&r->req, GOOD); +} /* Read more data from scsi device into buffer. */ static void scsi_read_data(SCSIRequest *req) @@ -794,7 +812,6 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev); uint64_t nb_sectors; int buflen = 0; - int ret; switch (req->cmd.buf[0]) { case TEST_UNIT_READY: @@ -866,20 +883,6 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) outbuf[7] = 0; buflen = 8; break; - case SYNCHRONIZE_CACHE: - { - BlockAcctCookie acct; - - bdrv_acct_start(s->bs, &acct, 0, BDRV_ACCT_FLUSH); - ret = bdrv_flush(s->bs); - bdrv_acct_done(s->bs, &acct); - if (ret < 0) { - if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_FLUSH)) { - return -1; - } - } - break; - } case GET_CONFIGURATION: memset(outbuf, 0, 8); /* ??? This should probably return much more information. For now @@ -987,7 +990,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) case START_STOP: case ALLOW_MEDIUM_REMOVAL: case READ_CAPACITY_10: - case SYNCHRONIZE_CACHE: case READ_TOC: case GET_CONFIGURATION: case SERVICE_ACTION_IN: @@ -999,6 +1001,13 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) r->iov.iov_len = rc; break; + case SYNCHRONIZE_CACHE: + bdrv_acct_start(s->bs, &r->acct, 0, BDRV_ACCT_FLUSH); + r->req.aiocb = bdrv_aio_flush(s->bs, scsi_flush_complete, r); + if (r->req.aiocb == NULL) { + scsi_flush_complete(r, -EIO); + } + return 0; case READ_6: case READ_10: case READ_12: