From patchwork Mon Jun 6 16:04:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 98966 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 1522BB6FB3 for ; Tue, 7 Jun 2011 03:47:34 +1000 (EST) Received: from localhost ([::1]:35403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTdti-0007PK-8L for incoming@patchwork.ozlabs.org; Mon, 06 Jun 2011 13:47:30 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcIR-0005q8-6Y for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:05:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTcIO-0000FW-Fz for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:04:54 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:51045) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcIN-0000FC-EX for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:04:52 -0400 Received: by pzk30 with SMTP id 30so2107087pzk.4 for ; Mon, 06 Jun 2011 09:04:50 -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=Iz/H2pV9W9V+OC9DUgnHOEEYWCZlny3gvWFXEkN7xww=; b=CBvRd83lPmpLq0m+QbBCQ4bQageJQN7eqdL0FoN+XH+JP5pbm80PGVFVmJ12LChHTX BE5HbkpNH4eaEHLQ7ETNyqfexsrtEUJ68Vh3Qs0N0+bRF93w3KDPszGwQAjfMQHW/Gwj Y9aZvJieWndJlJWY64O9tvzGQ9J++2vLzYX30= 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=DAZG0k0vj7m90B/k4HxzqUoWfsSP5U1tHPxCdJzjnaE1YPQ97sEBt80irBi+oT+m1d DSfM1e/IaLyUMN66eGQYQiGjkEkxFBIlzgNBhE1M41Du3NBwW21qZV6DSOyjVmdqrIvd aGzJPkoRwyR92gb2f2eb8TfLmJBJ21jqm2K/I= Received: by 10.142.65.32 with SMTP id n32mr777593wfa.99.1307376289991; Mon, 06 Jun 2011 09:04:49 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id c3sm3770633pbk.77.2011.06.06.09.04.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Jun 2011 09:04:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2011 18:04:10 +0200 Message-Id: <1307376262-1255-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1307376262-1255-1-git-send-email-pbonzini@redhat.com> References: <1307376262-1255-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [RFC PATCH v2 01/13] scsi: cleanup reset and destroy callbacks 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 Push scsi_device_purge_requests up from scsi-disk and scsi-generic to SCSIDevice. Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 12 ++++++++++++ hw/scsi-disk.c | 13 +++++-------- hw/scsi-generic.c | 9 --------- hw/scsi.h | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index ad6a730..3918662 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -71,6 +71,7 @@ static int scsi_qdev_exit(DeviceState *qdev) SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, dev->qdev.parent_bus); assert(bus->devs[dev->id] != NULL); + scsi_device_purge_requests(bus->devs[dev->id]); if (bus->devs[dev->id]->info->destroy) { bus->devs[dev->id]->info->destroy(bus->devs[dev->id]); } @@ -78,12 +79,23 @@ static int scsi_qdev_exit(DeviceState *qdev) return 0; } +static void scsi_qdev_reset(DeviceState *qdev) +{ + SCSIDevice *dev = DO_UPCAST(SCSIDevice, qdev, qdev); + + scsi_device_purge_requests(dev); + if (dev->info->reset) { + dev->info->reset(dev); + } +} + void scsi_qdev_register(SCSIDeviceInfo *info) { info->qdev.bus_info = &scsi_bus_info; info->qdev.init = scsi_qdev_init; info->qdev.unplug = qdev_simple_unplug_cb; info->qdev.exit = scsi_qdev_exit; + info->qdev.reset = scsi_qdev_reset; qdev_register(&info->qdev); } diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index a8c7372..76c1748 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1160,13 +1160,11 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) } } -static void scsi_disk_reset(DeviceState *dev) +static void scsi_disk_reset(SCSIDevice *dev) { - SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev.qdev, dev); + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); uint64_t nb_sectors; - scsi_device_purge_requests(&s->qdev); - bdrv_get_geometry(s->bs, &nb_sectors); nb_sectors /= s->cluster_size; if (nb_sectors) { @@ -1179,7 +1177,6 @@ static void scsi_destroy(SCSIDevice *dev) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); - scsi_device_purge_requests(&s->qdev); blockdev_mark_auto_del(s->qdev.conf.bs); } @@ -1266,7 +1263,7 @@ static SCSIDeviceInfo scsi_disk_info[] = { .qdev.fw_name = "disk", .qdev.desc = "virtual SCSI disk", .qdev.size = sizeof(SCSIDiskState), - .qdev.reset = scsi_disk_reset, + .reset = scsi_disk_reset, .init = scsi_hd_initfn, .destroy = scsi_destroy, .alloc_req = scsi_new_request, @@ -1287,7 +1284,7 @@ static SCSIDeviceInfo scsi_disk_info[] = { .qdev.fw_name = "disk", .qdev.desc = "virtual SCSI CD-ROM", .qdev.size = sizeof(SCSIDiskState), - .qdev.reset = scsi_disk_reset, + .reset = scsi_disk_reset, .init = scsi_cd_initfn, .destroy = scsi_destroy, .alloc_req = scsi_new_request, @@ -1307,7 +1304,7 @@ static SCSIDeviceInfo scsi_disk_info[] = { .qdev.fw_name = "disk", .qdev.desc = "virtual SCSI disk or CD-ROM (legacy)", .qdev.size = sizeof(SCSIDiskState), - .qdev.reset = scsi_disk_reset, + .reset = scsi_disk_reset, .init = scsi_disk_initfn, .destroy = scsi_destroy, .alloc_req = scsi_new_request, diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 8e59c7e..b67e154 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -456,18 +456,10 @@ static int get_stream_blocksize(BlockDriverState *bdrv) return (buf[9] << 16) | (buf[10] << 8) | buf[11]; } -static void scsi_generic_reset(DeviceState *dev) -{ - SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev.qdev, dev); - - scsi_device_purge_requests(&s->qdev); -} - static void scsi_destroy(SCSIDevice *d) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, d); - scsi_device_purge_requests(&s->qdev); blockdev_mark_auto_del(s->qdev.conf.bs); } @@ -541,7 +533,6 @@ static SCSIDeviceInfo scsi_generic_info = { .qdev.name = "scsi-generic", .qdev.desc = "pass through generic scsi device (/dev/sg*)", .qdev.size = sizeof(SCSIGenericState), - .qdev.reset = scsi_generic_reset, .init = scsi_generic_initfn, .destroy = scsi_destroy, .alloc_req = scsi_new_request, diff --git a/hw/scsi.h b/hw/scsi.h index c1dca35..8d60c3a 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -62,11 +62,11 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track); int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num); /* scsi-bus.c */ -typedef int (*scsi_qdev_initfn)(SCSIDevice *dev); struct SCSIDeviceInfo { DeviceInfo qdev; - scsi_qdev_initfn init; + int (*init)(SCSIDevice *dev); void (*destroy)(SCSIDevice *s); + void (*reset)(SCSIDevice *s); SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun); void (*free_req)(SCSIRequest *req); int32_t (*send_command)(SCSIRequest *req, uint8_t *buf);