From patchwork Wed Oct 26 16:30:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9397759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A0DCB60234 for ; Wed, 26 Oct 2016 17:06:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A476D29CC9 for ; Wed, 26 Oct 2016 17:06:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96B1E29CCB; Wed, 26 Oct 2016 17:06:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 05B3B29CC9 for ; Wed, 26 Oct 2016 17:06:43 +0000 (UTC) Received: from localhost ([::1]:36162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzRf0-0002aM-A8 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Oct 2016 13:06:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzR6O-0006Zk-5M for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:30:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzR6M-0003RA-QU for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:30:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40726) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzR6M-0003Qv-IV for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:30:54 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CE25367BB5; Wed, 26 Oct 2016 16:30:53 +0000 (UTC) Received: from localhost (ovpn-116-163.phx2.redhat.com [10.3.116.163]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9QGUqXY031164; Wed, 26 Oct 2016 12:30:53 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 26 Oct 2016 14:30:23 -0200 Message-Id: <1477499426-9550-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1477499426-9550-1-git-send-email-ehabkost@redhat.com> References: <1477499426-9550-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 26 Oct 2016 16:30:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 5/8] qdev: Register static properties as class properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Instead of registering qdev static properties on instance_init, register them as class properties, at qdev_class_set_props(). qdev_property_add_legacy() was replaced by an equivalent qdev_class_property_add_legacy() function. qdev_property_add_static(), on the other hand, can't be eliminated yet because it is used by arm_cpu_post_init(). Signed-off-by: Eduardo Habkost --- Changes series v1 -> v2: * (none) Changes v2 -> v3: * Fix code alignemnt * Reported-by: Igor Mammedov --- hw/core/qdev.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 85952e8..a88753c 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -739,12 +739,12 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, } /** - * qdev_property_add_legacy: - * @dev: Device to add the property to. + * qdev_class_property_add_legacy: + * @oc: Device to add the property to. * @prop: The qdev property definition. * @errp: location to store error information. * - * Add a legacy QOM property to @dev for qdev property @prop. + * Add a legacy QOM property to @oc for qdev property @prop. * On error, store error in @errp. * * Legacy properties are string versions of QOM properties. The format of @@ -754,8 +754,8 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, * Do not use this is new code! QOM Properties added through this interface * will be given names in the "legacy" namespace. */ -static void qdev_property_add_legacy(DeviceState *dev, Property *prop, - Error **errp) +static void qdev_class_property_add_legacy(ObjectClass *oc, Property *prop, + Error **errp) { gchar *name; @@ -765,11 +765,13 @@ static void qdev_property_add_legacy(DeviceState *dev, Property *prop, } name = g_strdup_printf("legacy-%s", prop->name); - object_property_add(OBJECT(dev), name, "str", - prop->info->print ? qdev_get_legacy_property : prop->info->get, - NULL, - NULL, - prop, errp); + object_class_property_add(oc, name, "str", + prop->info->print ? + qdev_get_legacy_property : + prop->info->get, + NULL, + NULL, + prop, errp); g_free(name); } @@ -844,6 +846,45 @@ void qdev_property_add_static(DeviceState *dev, Property *prop, qdev_property_set_to_default(dev, prop, &error_abort); } +/** + * qdev_class_property_add_static: + * @oc: Class to add the property to. + * @prop: The qdev property definition. + * @errp: location to store error information. + * + * Add a static QOM property to @oc for qdev property @prop. + * On error, store error in @errp. Static properties access data in a struct. + * The type of the QOM property is derived from prop->info. + */ +static void qdev_class_property_add_static(ObjectClass *oc, Property *prop, + Error **errp) +{ + Error *local_err = NULL; + + /* + * TODO qdev_prop_ptr does not have getters or setters. It must + * go now that it can be replaced with links. The test should be + * removed along with it: all static properties are read/write. + */ + if (!prop->info->get && !prop->info->set) { + return; + } + + object_class_property_add(oc, prop->name, prop->info->name, + prop->info->get, prop->info->set, + prop->info->release, + prop, &local_err); + + if (local_err) { + error_propagate(errp, local_err); + return; + } + + object_class_property_set_description(oc, prop->name, + prop->info->description, + &error_abort); +} + /* @qdev_alias_all_properties - Add alias properties to the source object for * all qdev properties on the target DeviceState. */ @@ -867,8 +908,15 @@ void qdev_alias_all_properties(DeviceState *target, Object *source) void device_class_set_props(DeviceClass *dc, Property *props) { + Property *prop; + ObjectClass *oc = OBJECT_CLASS(dc); + assert(!dc->props); dc->props = props; + for (prop = dc->props; prop && prop->name; prop++) { + qdev_class_property_add_legacy(oc, prop, &error_abort); + qdev_class_property_add_static(oc, prop, &error_abort); + } } static int qdev_add_hotpluggable_device(Object *obj, void *opaque) @@ -1068,8 +1116,7 @@ static void device_initfn(Object *obj) class = object_get_class(OBJECT(dev)); do { for (prop = DEVICE_CLASS(class)->props; prop && prop->name; prop++) { - qdev_property_add_legacy(dev, prop, &error_abort); - qdev_property_add_static(dev, prop, &error_abort); + qdev_property_set_to_default(dev, prop, &error_abort); } class = object_class_get_parent(class); } while (class != object_class_by_name(TYPE_DEVICE));