From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpmWa-00059a-O5 for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:59:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpmKR-0006G2-Qf for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:46:53 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:59625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpmKR-0006Fx-Mh for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:46:51 -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 ; Tue, 24 Jan 2012 14:46:51 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 44EB16E8061 for ; Tue, 24 Jan 2012 14:46:40 -0500 (EST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0OJZZ7M161466 for ; Tue, 24 Jan 2012 14:45:22 -0500 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0OJXTic007566 for ; Tue, 24 Jan 2012 12:33:29 -0700 From: Anthony Liguori Date: Tue, 24 Jan 2012 13:32:57 -0600 Message-Id: <1327433600-7403-6-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> References: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 05/28] qdev: integrate with QEMU Object Model (v2) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori This is a very shallow integration. We register a TYPE_DEVICE but only use QOM as basically a memory allocator. This will make all devices show up as QOM objects but they will all carry the TYPE_DEVICE. Signed-off-by: Anthony Liguori --- v1 -> v2 - update for new location of object.h --- hw/qdev.c | 27 +++++++++++++++++++++++++-- hw/qdev.h | 10 ++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 5a75668..3bc9166 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -47,9 +47,17 @@ static BusState *qbus_find(const char *path); /* Register a new device type. */ void qdev_register(DeviceInfo *info) { + TypeInfo type_info = {}; + assert(info->size >= sizeof(DeviceState)); assert(!info->next); + type_info.name = info->name; + type_info.parent = TYPE_DEVICE; + type_info.instance_size = info->size; + + type_register_static(&type_info); + info->next = device_info_list; device_info_list = info; } @@ -93,7 +101,7 @@ static DeviceState *qdev_create_from_info(BusState *bus, DeviceInfo *info) Property *prop; assert(bus->info == info->bus_info); - dev = g_malloc0(info->size); + dev = DEVICE(object_new(info->name)); dev->info = info; dev->parent_bus = bus; qdev_prop_set_defaults(dev, dev->info->props); @@ -519,7 +527,7 @@ void qdev_free(DeviceState *dev) if (dev->ref != 0) { qerror_report(QERR_DEVICE_IN_USE, dev->id?:""); } - g_free(dev); + object_delete(OBJECT(dev)); } void qdev_machine_creation_done(void) @@ -1572,3 +1580,18 @@ void qdev_machine_init(void) qdev_get_peripheral_anon(); qdev_get_peripheral(); } + +static TypeInfo device_type_info = { + .name = TYPE_DEVICE, + .parent = TYPE_OBJECT, + .instance_size = sizeof(DeviceState), + .abstract = true, + .class_size = sizeof(DeviceClass), +}; + +static void init_qdev(void) +{ + type_register_static(&device_type_info); +} + +device_init(init_qdev); diff --git a/hw/qdev.h b/hw/qdev.h index 6b58dd8..1e01a04 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -6,6 +6,7 @@ #include "qemu-char.h" #include "qemu-option.h" #include "qapi/qapi-visit-core.h" +#include "qemu/object.h" typedef struct Property Property; @@ -66,9 +67,18 @@ typedef struct DeviceProperty QTAILQ_ENTRY(DeviceProperty) node; } DeviceProperty; +#define TYPE_DEVICE "device" +#define DEVICE(obj) OBJECT_CHECK(DeviceState, (obj), TYPE_DEVICE) + +typedef struct DeviceClass { + ObjectClass parent_class; +} DeviceClass; + /* This structure should not be accessed directly. We declare it here so that it can be embedded in individual device state structures. */ struct DeviceState { + Object parent_obj; + const char *id; enum DevState state; QemuOpts *opts; -- 1.7.4.1