From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1j1-0008U3-9g for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:16:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF1is-0003AT-Qj for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:16:34 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:59641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF1is-00038a-Ht for qemu-devel@nongnu.org; Tue, 03 Apr 2012 07:16:26 -0400 Received: by mail-pz0-f46.google.com with SMTP id z9so4190452dad.33 for ; Tue, 03 Apr 2012 04:16:25 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Apr 2012 13:15:33 +0200 Message-Id: <1333451753-3550-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1333451753-3550-1-git-send-email-pbonzini@redhat.com> References: <1333451753-3550-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 05/25] qom: push type up to Object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, afaerber@suse.de Now that Object is a type, add an instance_init function and push the "type" property from qdev to there. Signed-off-by: Paolo Bonzini --- hw/qdev.c | 6 ------ qom/object.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 0d3c0fc..bb6c1aa 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -510,11 +510,6 @@ char* qdev_get_fw_dev_path(DeviceState *dev) return strdup(path); } -static char *qdev_get_type(Object *obj, Error **errp) -{ - return g_strdup(object_get_typename(obj)); -} - /** * Legacy property handling */ @@ -630,7 +625,6 @@ static void device_initfn(Object *obj) qdev_property_add_static(dev, prop, NULL); } - object_property_add_str(OBJECT(dev), "type", qdev_get_type, NULL, NULL); qdev_prop_set_defaults(dev, qdev_get_props(dev)); } diff --git a/qom/object.c b/qom/object.c index 585619d..f3ffaa6 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1215,6 +1215,16 @@ void object_property_add_str(Object *obj, const char *name, prop, errp); } +static char *qdev_get_type(Object *obj, Error **errp) +{ + return g_strdup(object_get_typename(obj)); +} + +static void object_instance_init(Object *obj) +{ + object_property_add_str(obj, "type", qdev_get_type, NULL, NULL); +} + static void register_types(void) { static TypeInfo interface_info = { @@ -1226,6 +1236,7 @@ static void register_types(void) static TypeInfo object_info = { .name = TYPE_OBJECT, .instance_size = sizeof(Object), + .instance_init = object_instance_init, .abstract = true, }; -- 1.7.9.3