From patchwork Tue Jan 3 00:52:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 133941 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 C6F6EB6FA5 for ; Tue, 3 Jan 2012 12:47:02 +1100 (EST) Received: from localhost ([::1]:56393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rhsdp-0003aG-Gl for incoming@patchwork.ozlabs.org; Mon, 02 Jan 2012 19:54:13 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rhscd-0001sm-SA for qemu-devel@nongnu.org; Mon, 02 Jan 2012 19:53:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rhscb-0008LC-1Y for qemu-devel@nongnu.org; Mon, 02 Jan 2012 19:52:59 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:33830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rhsca-0008L7-0F for qemu-devel@nongnu.org; Mon, 02 Jan 2012 19:52:56 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Jan 2012 19:52:55 -0500 Received: from d01relay03.pok.ibm.com (9.56.227.235) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 2 Jan 2012 19:52:52 -0500 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q030qqS8316410 for ; Mon, 2 Jan 2012 19:52:52 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q030qpxj002422 for ; Mon, 2 Jan 2012 22:52:51 -0200 Received: from titi.austin.rr.com (sig-9-65-105-201.mts.ibm.com [9.65.105.201]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q030qLpk000958; Mon, 2 Jan 2012 22:52:50 -0200 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 2 Jan 2012 18:52:11 -0600 Message-Id: <1325551939-24749-23-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1325551939-24749-1-git-send-email-aliguori@us.ibm.com> References: <1325551939-24749-1-git-send-email-aliguori@us.ibm.com> x-cbid: 12010300-7182-0000-0000-0000007ACCC5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.139 Cc: Paolo Bonzini , Anthony Liguori , Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 22/30] ide: convert to QEMU Object Model 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 Signed-off-by: Anthony Liguori --- hw/ide/internal.h | 20 ++++++--- hw/ide/qdev.c | 111 +++++++++++++++++++++++++++++++++-------------------- 2 files changed, 82 insertions(+), 49 deletions(-) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 00b28df..c808a0d 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -21,7 +21,6 @@ typedef struct IDEBus IDEBus; typedef struct IDEDevice IDEDevice; -typedef struct IDEDeviceInfo IDEDeviceInfo; typedef struct IDEState IDEState; typedef struct IDEDMA IDEDMA; typedef struct IDEDMAOps IDEDMAOps; @@ -450,6 +449,19 @@ struct IDEBus { int error_status; }; +#define TYPE_IDE_DEVICE "ide-device" +#define IDE_DEVICE(obj) \ + OBJECT_CHECK(IDEDevice, (obj), TYPE_IDE_DEVICE) +#define IDE_DEVICE_CLASS(klass) \ + OBJECT_CLASS_CHECK(IDEDeviceClass, (klass), TYPE_IDE_DEVICE) +#define IDE_DEVICE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(IDEDeviceClass, (obj), TYPE_IDE_DEVICE) + +typedef struct IDEDeviceClass { + DeviceClass parent_class; + int (*init)(IDEDevice *dev); +} IDEDeviceClass; + struct IDEDevice { DeviceState qdev; uint32_t unit; @@ -458,12 +470,6 @@ struct IDEDevice { char *serial; }; -typedef int (*ide_qdev_initfn)(IDEDevice *dev); -struct IDEDeviceInfo { - DeviceInfo qdev; - ide_qdev_initfn init; -}; - #define BM_STATUS_DMAING 0x01 #define BM_STATUS_ERROR 0x02 #define BM_STATUS_INT 0x04 diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 4207127..b507e34 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -55,8 +55,8 @@ static char *idebus_get_fw_dev_path(DeviceState *dev) static int ide_qdev_init(DeviceState *qdev, DeviceInfo *base) { - IDEDevice *dev = DO_UPCAST(IDEDevice, qdev, qdev); - IDEDeviceInfo *info = DO_UPCAST(IDEDeviceInfo, qdev, base); + IDEDevice *dev = IDE_DEVICE(qdev); + IDEDeviceClass *dc = IDE_DEVICE_GET_CLASS(dev); IDEBus *bus = DO_UPCAST(IDEBus, qbus, qdev->parent_bus); if (!dev->conf.bs) { @@ -85,17 +85,17 @@ static int ide_qdev_init(DeviceState *qdev, DeviceInfo *base) error_report("Invalid IDE unit %d", dev->unit); goto err; } - return info->init(dev); + return dc->init(dev); err: return -1; } -static void ide_qdev_register(IDEDeviceInfo *info) +static void ide_qdev_register(DeviceInfo *info) { - info->qdev.init = ide_qdev_init; - info->qdev.bus_info = &ide_bus_info; - qdev_register(&info->qdev); + info->init = ide_qdev_init; + info->bus_info = &ide_bus_info; + qdev_register_subclass(info, TYPE_IDE_DEVICE); } IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive) @@ -182,46 +182,73 @@ static int ide_drive_initfn(IDEDevice *dev) DEFINE_PROP_STRING("ver", IDEDrive, dev.version), \ DEFINE_PROP_STRING("serial", IDEDrive, dev.serial) -static IDEDeviceInfo ide_dev_info[] = { - { - .qdev.name = "ide-hd", - .qdev.fw_name = "drive", - .qdev.desc = "virtual IDE disk", - .qdev.size = sizeof(IDEDrive), - .init = ide_hd_initfn, - .qdev.props = (Property[]) { - DEFINE_IDE_DEV_PROPERTIES(), - DEFINE_PROP_END_OF_LIST(), - } - },{ - .qdev.name = "ide-cd", - .qdev.fw_name = "drive", - .qdev.desc = "virtual IDE CD-ROM", - .qdev.size = sizeof(IDEDrive), - .init = ide_cd_initfn, - .qdev.props = (Property[]) { - DEFINE_IDE_DEV_PROPERTIES(), - DEFINE_PROP_END_OF_LIST(), - } - },{ - .qdev.name = "ide-drive", /* legacy -device ide-drive */ - .qdev.fw_name = "drive", - .qdev.desc = "virtual IDE disk or CD-ROM (legacy)", - .qdev.size = sizeof(IDEDrive), - .init = ide_drive_initfn, - .qdev.props = (Property[]) { - DEFINE_IDE_DEV_PROPERTIES(), - DEFINE_PROP_END_OF_LIST(), - } +static void ide_hd_class_init(ObjectClass *klass, void *data) +{ + IDEDeviceClass *k = IDE_DEVICE_CLASS(klass); + k->init = ide_hd_initfn; +} + +static DeviceInfo ide_hd_info = { + .name = "ide-hd", + .fw_name = "drive", + .desc = "virtual IDE disk", + .size = sizeof(IDEDrive), + .class_init = ide_hd_class_init, + .props = (Property[]) { + DEFINE_IDE_DEV_PROPERTIES(), + DEFINE_PROP_END_OF_LIST(), } }; -static void ide_dev_register(void) +static void ide_cd_class_init(ObjectClass *klass, void *data) { - int i; + IDEDeviceClass *k = IDE_DEVICE_CLASS(klass); + k->init = ide_cd_initfn; +} - for (i = 0; i < ARRAY_SIZE(ide_dev_info); i++) { - ide_qdev_register(&ide_dev_info[i]); +static DeviceInfo ide_cd_info = { + .name = "ide-cd", + .fw_name = "drive", + .desc = "virtual IDE CD-ROM", + .size = sizeof(IDEDrive), + .class_init = ide_cd_class_init, + .props = (Property[]) { + DEFINE_IDE_DEV_PROPERTIES(), + DEFINE_PROP_END_OF_LIST(), } +}; + +static void ide_drive_class_init(ObjectClass *klass, void *data) +{ + IDEDeviceClass *k = IDE_DEVICE_CLASS(klass); + k->init = ide_drive_initfn; +} + +static DeviceInfo ide_drive_info = { + .name = "ide-drive", /* legacy -device ide-drive */ + .fw_name = "drive", + .desc = "virtual IDE disk or CD-ROM (legacy)", + .size = sizeof(IDEDrive), + .class_init = ide_drive_class_init, + .props = (Property[]) { + DEFINE_IDE_DEV_PROPERTIES(), + DEFINE_PROP_END_OF_LIST(), + } +}; + +static TypeInfo ide_device_type_info = { + .name = TYPE_IDE_DEVICE, + .parent = TYPE_DEVICE, + .instance_size = sizeof(IDEDevice), + .abstract = true, + .class_size = sizeof(IDEDeviceClass), +}; + +static void ide_dev_register(void) +{ + ide_qdev_register(&ide_hd_info); + ide_qdev_register(&ide_cd_info); + ide_qdev_register(&ide_drive_info); + type_register_static(&ide_device_type_info); } device_init(ide_dev_register);