From patchwork Fri Sep 25 19:42:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 34292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4F0F0B7BC0 for ; Sat, 26 Sep 2009 06:03:54 +1000 (EST) Received: from localhost ([127.0.0.1]:57168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrH1D-0005Jo-RA for incoming@patchwork.ozlabs.org; Fri, 25 Sep 2009 16:03:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MrGhE-0006Tr-Jy for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MrGh8-0006P2-HH for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:11 -0400 Received: from [199.232.76.173] (port=56047 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrGh7-0006Nb-3f for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35653) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MrGh6-0004dj-2h for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:04 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8PJh3Qd019926 for ; Fri, 25 Sep 2009 15:43:03 -0400 Received: from zweiblum.home.kraxel.org (vpn2-8-108.ams2.redhat.com [10.36.8.108]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8PJguDc019922; Fri, 25 Sep 2009 15:42:57 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 7A4C5700EF; Fri, 25 Sep 2009 21:42:50 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 25 Sep 2009 21:42:36 +0200 Message-Id: <1253907769-1067-12-git-send-email-kraxel@redhat.com> In-Reply-To: <1253907769-1067-1-git-send-email-kraxel@redhat.com> References: <1253907769-1067-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 11/24] Implement scsi device destruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/scsi-bus.c | 24 +++++++++++++++++++++--- hw/scsi-disk.c | 6 ------ hw/scsi-generic.c | 2 -- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 881e363..27defc4 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -30,6 +30,7 @@ static int scsi_qdev_init(DeviceState *qdev, DeviceInfo *base) SCSIDevice *dev = DO_UPCAST(SCSIDevice, qdev, qdev); SCSIDeviceInfo *info = DO_UPCAST(SCSIDeviceInfo, qdev, base); SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, dev->qdev.parent_bus); + int rc = -1; if (dev->id == -1) { for (dev->id = 0; dev->id < bus->ndev; dev->id++) { @@ -43,21 +44,38 @@ static int scsi_qdev_init(DeviceState *qdev, DeviceInfo *base) } if (bus->devs[dev->id]) { - bus->devs[dev->id]->info->destroy(bus->devs[dev->id]); + qdev_free(&bus->devs[dev->id]->qdev); } bus->devs[dev->id] = dev; dev->info = info; - return dev->info->init(dev); + rc = dev->info->init(dev); + if (rc != 0) { + bus->devs[dev->id] = NULL; + } err: - return -1; + return rc; +} + +static int scsi_qdev_exit(DeviceState *qdev) +{ + SCSIDevice *dev = DO_UPCAST(SCSIDevice, qdev, qdev); + SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, dev->qdev.parent_bus); + + assert(bus->devs[dev->id] != NULL); + if (bus->devs[dev->id]->info->destroy) { + bus->devs[dev->id]->info->destroy(bus->devs[dev->id]); + } + bus->devs[dev->id] = NULL; + return 0; } void scsi_qdev_register(SCSIDeviceInfo *info) { info->qdev.bus_info = &scsi_bus_info; info->qdev.init = scsi_qdev_init; + info->qdev.exit = scsi_qdev_exit; qdev_register(&info->qdev); } diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index de8e314..0f029f8 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -936,11 +936,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, } } -static void scsi_destroy(SCSIDevice *d) -{ - qemu_free(d); -} - static int scsi_disk_initfn(SCSIDevice *dev) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); @@ -974,7 +969,6 @@ static SCSIDeviceInfo scsi_disk_info = { .qdev.desc = "virtual scsi disk or cdrom", .qdev.size = sizeof(SCSIDiskState), .init = scsi_disk_initfn, - .destroy = scsi_destroy, .send_command = scsi_send_command, .read_data = scsi_read_data, .write_data = scsi_write_data, diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index f8c010b..86d1e54 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -668,8 +668,6 @@ static void scsi_destroy(SCSIDevice *d) qemu_free(r); r = n; } - - qemu_free(d); } static int scsi_generic_initfn(SCSIDevice *dev)