From patchwork Fri Jul 27 15:02:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 173742 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 08EAB2C0087 for ; Sat, 28 Jul 2012 02:36:04 +1000 (EST) Received: from localhost ([::1]:48409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum5M-0007i6-CB for incoming@patchwork.ozlabs.org; Fri, 27 Jul 2012 11:04:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum4t-0006jP-A0 for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:03:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sum4p-0007K9-A7 for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:03:43 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:59010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum4p-0007FU-4P for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:03:39 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so4974590pbb.4 for ; Fri, 27 Jul 2012 08:03:38 -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=wfPt8xw0bMJqfqcL5Iz6mNCG7L02/BMGLMzPnSKM6h4=; b=zTEqKZ+czAPbC9rGsB7UKe8sIKsLY2JBTSFeh8gzt9Je748I2GgmmZCV+hBqoJJ9m4 lRDfVjeJxDksul9zg6wGZIKdPEbS5r4LFoVtyXsnb2Kj/hxLem74FgUblVKs24dgEZR3 FTcqJjHo+uSwJ0XIsQQRnM6U0j7wpR9cvDJEZ88Kp4l+WMkx4LaDWFC9N6t17HgMnShb vJDY/ypm++fqYed+bvAZi8vEySwfcEzfs6tcKKWGlg6iMz0Nc2OyVuaa6O5X9LpqlGtO oZnsgLFngHMSGTNGnzLWEnU7Ut96lKHwrzEO7KtY89ckbS4L/EZbBoyk6wiqx4vyE85t BieQ== Received: by 10.68.225.42 with SMTP id rh10mr14765983pbc.116.1343401418730; Fri, 27 Jul 2012 08:03:38 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id nk3sm2062530pbc.27.2012.07.27.08.03.36 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 08:03:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 27 Jul 2012 17:02:36 +0200 Message-Id: <1343401379-19495-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343401379-19495-1-git-send-email-pbonzini@redhat.com> References: <1343401379-19495-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/32] scsi-disk: make discard asynchronous 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 By making discard asynchronous, we can reuse all the error handling code that is used for other commands. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 788fe86..f8e9dc1 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -169,7 +169,7 @@ static void scsi_disk_load_request(QEMUFile *f, SCSIRequest *req) qemu_iovec_init_external(&r->qiov, &r->iov, 1); } -static void scsi_flush_complete(void * opaque, int ret) +static void scsi_aio_complete(void *opaque, int ret) { SCSIDiskReq *r = (SCSIDiskReq *)opaque; SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); @@ -222,7 +222,7 @@ static void scsi_write_do_fua(SCSIDiskReq *r) if (scsi_is_cmd_fua(&r->req.cmd)) { bdrv_acct_start(s->qdev.conf.bs, &r->acct, 0, BDRV_ACCT_FLUSH); - r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_flush_complete, r); + r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_aio_complete, r); return; } @@ -1543,7 +1543,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) /* The request is used as the AIO opaque value, so add a ref. */ scsi_req_ref(&r->req); bdrv_acct_start(s->qdev.conf.bs, &r->acct, 0, BDRV_ACCT_FLUSH); - r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_flush_complete, r); + r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_aio_complete, r); return 0; case READ_6: case READ_10: @@ -1620,15 +1620,13 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) goto fail; } - rc = bdrv_discard(s->qdev.conf.bs, - r->req.cmd.lba * (s->qdev.blocksize / 512), - len * (s->qdev.blocksize / 512)); - if (rc < 0) { - /* XXX: better error code ?*/ - goto fail; - } - - break; + /* The request is used as the AIO opaque value, so add a ref. */ + scsi_req_ref(&r->req); + r->req.aiocb = bdrv_aio_discard(s->qdev.conf.bs, + r->req.cmd.lba * (s->qdev.blocksize / 512), + len * (s->qdev.blocksize / 512), + scsi_aio_complete, r); + return 0; default: DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]); scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));