From patchwork Mon Dec 12 20:18:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 130824 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 2A1261007D7 for ; Tue, 13 Dec 2011 07:24:57 +1100 (EST) Received: from localhost ([::1]:60971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCQd-0006Is-BG for incoming@patchwork.ozlabs.org; Mon, 12 Dec 2011 15:24:51 -0500 Received: from eggs.gnu.org ([140.186.70.92]:42017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCQX-0006In-4a for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:24:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaCQV-00016b-UN for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:24:45 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:44685 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCQV-00013x-7Q for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:24:43 -0500 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id pBCKNqnU032673; Mon, 12 Dec 2011 14:23:53 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id pBCKNmrN032669; Mon, 12 Dec 2011 14:23:48 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 12 Dec 2011 14:18:30 -0600 Message-Id: <1323721273-32404-35-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> References: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.132.139 Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Stefan Hajnoczi , Jan Kiszka , Markus Armbruster , Luiz Capitulino Subject: [Qemu-devel] [PATCH v3 034/197] qdev: add isa-device as a subclass of device 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/isa-bus.c | 11 ++++++++++- hw/isa.h | 12 ++++++++++++ hw/pci.c | 2 +- hw/qdev.c | 9 +++++++-- hw/qdev.h | 1 + 5 files changed, 31 insertions(+), 4 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 7c2c261..0beb1bf 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -126,7 +126,7 @@ void isa_qdev_register(ISADeviceInfo *info) { info->qdev.init = isa_qdev_init; info->qdev.bus_info = &isa_bus_info; - qdev_register(&info->qdev); + qdev_register_subclass(&info->qdev, TYPE_ISA_DEVICE); } ISADevice *isa_create(const char *name) @@ -189,9 +189,18 @@ static SysBusDeviceInfo isabus_bridge_info = { .qdev.no_user = 1, }; +static TypeInfo isa_device_type_info = { + .name = TYPE_ISA_DEVICE, + .parent = TYPE_DEVICE, + .instance_size = sizeof(ISADevice), + .abstract = true, + .class_size = sizeof(ISADeviceClass), +}; + static void isabus_register_devices(void) { sysbus_register_withprop(&isabus_bridge_info); + type_register_static(&isa_device_type_info); } static char *isabus_get_fw_dev_path(DeviceState *dev) diff --git a/hw/isa.h b/hw/isa.h index 5eb9c78..af7e3dc 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -13,6 +13,18 @@ typedef struct ISABus ISABus; typedef struct ISADevice ISADevice; typedef struct ISADeviceInfo ISADeviceInfo; +#define TYPE_ISA_DEVICE "isa-device" +#define ISA_DEVICE(obj) \ + OBJECT_CHECK(ISADeviceState, (obj), ISA_TYPE_DEVICE) +#define ISA_DEVICE_CLASS(klass) \ + OBJECT_CLASS_CHECK(ISADeviceClass, (klass), ISA_TYPE_DEVICE) +#define ISA_DEVICE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(ISADeviceClass, (obj), ISA_TYPE_DEVICE) + +typedef struct ISADeviceClass { + DeviceClass parent_class; +} ISADeviceClass; + struct ISADevice { DeviceState qdev; uint32_t isairq[2]; diff --git a/hw/pci.c b/hw/pci.c index 16d676d..9992ea2 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -161,7 +161,7 @@ void pci_device_reset(PCIDevice *dev) int r; /* TODO: call the below unconditionally once all pci devices * are qdevified */ - if (OBJECT(dev)->type != 0) { + if (OBJECT(dev)->class != NULL) { qdev_reset_all(DEVICE(dev)); } diff --git a/hw/qdev.c b/hw/qdev.c index fed9848..e0c4a40 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -61,7 +61,7 @@ DeviceInfo *qdev_get_info(DeviceState *dev) return DEVICE_GET_CLASS(dev)->info; } -void qdev_register(DeviceInfo *info) +void qdev_register_subclass(DeviceInfo *info, const char *parent) { TypeInfo type_info = {}; @@ -69,7 +69,7 @@ void qdev_register(DeviceInfo *info) assert(!info->next); type_info.name = info->name; - type_info.parent = TYPE_DEVICE; + type_info.parent = parent; type_info.instance_size = info->size; type_info.class_init = qdev_subclass_init; type_info.class_data = info; @@ -80,6 +80,11 @@ void qdev_register(DeviceInfo *info) device_info_list = info; } +void qdev_register(DeviceInfo *info) +{ + qdev_register_subclass(info, TYPE_DEVICE); +} + static DeviceInfo *qdev_find_info(BusInfo *bus_info, const char *name) { DeviceInfo *info; diff --git a/hw/qdev.h b/hw/qdev.h index cd2eaf2..aab8f42 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -235,6 +235,7 @@ struct DeviceInfo { extern DeviceInfo *device_info_list; void qdev_register(DeviceInfo *info); +void qdev_register_subclass(DeviceInfo *info, const char *parent); /* Register device properties. */ /* GPIO inputs also double as IRQ sinks. */