From patchwork Mon May 16 12:16:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 95731 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 54E44B6EE9 for ; Mon, 16 May 2011 22:23:58 +1000 (EST) Received: from localhost ([::1]:35166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLwq2-0006ZX-L8 for incoming@patchwork.ozlabs.org; Mon, 16 May 2011 08:23:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:45320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLwjh-0003qN-3R for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QLwjf-0000CQ-QH for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:21 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLwjf-00007r-Hp for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:19 -0400 Received: by mail-ww0-f53.google.com with SMTP id 40so4444155wwj.10 for ; Mon, 16 May 2011 05:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=CG5kWc20YbaBuISyyOEjNx0vmOB8kPDTrk85Q8MOrlY=; b=p9jgfh2FKYBVC6nroZT5vDAMRrwCx/i3s1EW1OIjwWAxYi4UP6b9/ZmNCzMbalaDF/ M2uE3xvR/XvcWAgz5+R7l9x7BLpoJP7CtuTyWq8xiVfgNoFmnlYe0Lkxj0BlN2/Hguc6 v6Baf0lXsGnrmfJmABX41jivTHX9U5Y3P26LA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=AIkBtuifud6pQ5CBQAbigISBEDN30qaAFLSPl2jV7xVZU4O+mpjjrjqSn9nhFBf2E1 8OLFuI9oCReO3ry5B6/2NV7F0tmcWg91OPZY6UPG6j22pBlt9Tpjauf8PcxPzFx7iTwy FTckc2EHfR67YPVxtYXhwINJ8H4Qef92Ocmgo= Received: by 10.216.235.2 with SMTP id t2mr2169816weq.93.1305548239215; Mon, 16 May 2011 05:17:19 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id b20sm3105997wbb.67.2011.05.16.05.17.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 May 2011 05:17:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 May 2011 14:16:24 +0200 Message-Id: <1305548197-16196-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1305548197-16196-1-git-send-email-pbonzini@redhat.com> References: <1305548197-16196-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [PATCH v2 08/21] scsi: commonize purging requests 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 The code for canceling requests upon reset is already the same. Clean it up and move it to scsi-bus.c. Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 12 ++++++++++++ hw/scsi-disk.c | 18 ++---------------- hw/scsi-generic.c | 18 ++---------------- hw/scsi.h | 1 + 4 files changed, 17 insertions(+), 32 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index a175590..e1bb494 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -548,6 +548,18 @@ void scsi_req_complete(SCSIRequest *req) scsi_req_unref(req); } +void scsi_device_purge_requests(SCSIDevice *sdev) +{ + SCSIRequest *req; + + while (!QTAILQ_EMPTY(&sdev->requests)) { + req = QTAILQ_FIRST(&sdev->requests); + sdev->info->cancel_io(req); + scsi_req_dequeue(req); + scsi_req_unref(req); + } +} + static char *scsibus_get_fw_dev_path(DeviceState *dev) { SCSIDevice *d = (SCSIDevice*)dev; diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 7446115..8962c33 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1145,26 +1145,12 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) return len; } -static void scsi_disk_purge_requests(SCSIDiskState *s) -{ - SCSIDiskReq *r; - - while (!QTAILQ_EMPTY(&s->qdev.requests)) { - r = DO_UPCAST(SCSIDiskReq, req, QTAILQ_FIRST(&s->qdev.requests)); - if (r->req.aiocb) { - bdrv_aio_cancel(r->req.aiocb); - } - scsi_req_dequeue(&r->req); - scsi_req_unref(&r->req); - } -} - static void scsi_disk_reset(DeviceState *dev) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev.qdev, dev); uint64_t nb_sectors; - scsi_disk_purge_requests(s); + scsi_device_purge_requests(&s->qdev); bdrv_get_geometry(s->bs, &nb_sectors); nb_sectors /= s->cluster_size; @@ -1178,7 +1164,7 @@ static void scsi_destroy(SCSIDevice *dev) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); - scsi_disk_purge_requests(s); + scsi_device_purge_requests(&s->qdev); blockdev_mark_auto_del(s->qdev.conf.bs); } diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index e3e4187..896797c 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -422,32 +422,18 @@ static int get_stream_blocksize(BlockDriverState *bdrv) return (buf[9] << 16) | (buf[10] << 8) | buf[11]; } -static void scsi_generic_purge_requests(SCSIGenericState *s) -{ - SCSIGenericReq *r; - - while (!QTAILQ_EMPTY(&s->qdev.requests)) { - r = DO_UPCAST(SCSIGenericReq, req, QTAILQ_FIRST(&s->qdev.requests)); - if (r->req.aiocb) { - bdrv_aio_cancel(r->req.aiocb); - } - scsi_req_dequeue(&r->req); - scsi_req_unref(&r->req); - } -} - static void scsi_generic_reset(DeviceState *dev) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev.qdev, dev); - scsi_generic_purge_requests(s); + scsi_device_purge_requests(&s->qdev); } static void scsi_destroy(SCSIDevice *d) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, d); - scsi_generic_purge_requests(s); + scsi_device_purge_requests(&s->qdev); blockdev_mark_auto_del(s->qdev.conf.bs); } diff --git a/hw/scsi.h b/hw/scsi.h index e709989..dee8567 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -114,5 +114,6 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf); void scsi_req_print(SCSIRequest *req); void scsi_req_data(SCSIRequest *req, int len); void scsi_req_complete(SCSIRequest *req); +void scsi_device_purge_requests(SCSIDevice *sdev); #endif