From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobHi-0005NJ-9q for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobHf-0002W7-CA for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:54 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:36894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobHf-0002Vn-7T for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:51 -0400 From: Markus Armbruster Date: Wed, 3 Aug 2011 15:07:59 +0200 Message-Id: <1312376904-16115-21-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 20/45] ide: Provide IDEDeviceInfo method exit() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, quintela@redhat.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de Signed-off-by: Markus Armbruster --- hw/ide/internal.h | 1 + hw/ide/qdev.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 3e56b45..0b0b8a7 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -529,6 +529,7 @@ typedef int (*ide_qdev_initfn)(IDEDevice *dev); struct IDEDeviceInfo { DeviceInfo qdev; ide_qdev_initfn init; + ide_qdev_initfn exit; }; #define BM_STATUS_DMAING 0x01 diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 6bd8d20..3b7b306 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -91,9 +91,21 @@ err: return -1; } +static int ide_qdev_exit(DeviceState *qdev) +{ + IDEDevice *dev = DO_UPCAST(IDEDevice, qdev, qdev); + IDEDeviceInfo *info = DO_UPCAST(IDEDeviceInfo, qdev, qdev->info); + + if (info->exit) { + return info->exit(dev); + } + return 0; +} + static void ide_qdev_register(IDEDeviceInfo *info) { info->qdev.init = ide_qdev_init; + info->qdev.exit = ide_qdev_exit; info->qdev.bus_info = &ide_bus_info; qdev_register(&info->qdev); } -- 1.7.6