From patchwork Tue Feb 7 13:20:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 139920 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 C2C9E1007D3 for ; Wed, 8 Feb 2012 00:21:38 +1100 (EST) Received: from localhost ([::1]:54120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RukzI-0005JP-9p for incoming@patchwork.ozlabs.org; Tue, 07 Feb 2012 08:21:36 -0500 Received: from eggs.gnu.org ([140.186.70.92]:59395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rukyx-0005EV-0N for qemu-devel@nongnu.org; Tue, 07 Feb 2012 08:21:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rukyq-0003pg-7k for qemu-devel@nongnu.org; Tue, 07 Feb 2012 08:21:14 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:51128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rukyp-0003pJ-VB for qemu-devel@nongnu.org; Tue, 07 Feb 2012 08:21:08 -0500 Received: by pbaa11 with SMTP id a11so7892213pba.4 for ; Tue, 07 Feb 2012 05:21:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to; bh=BGV+mkwGOM+AVLhqoYJVKOpqhDwyQF/1YMEfLC+1jCI=; b=nfCj+umYR8XAI4iXEsbrGJCysHr2D7mP9wHCttPZvh2efOpKGKkyPnAbh2N2aZu4xQ a3rUY5U1OUyQQZQyLU101HipC96MZMXJisIL8u4xlh8DXLXbH6JbviFBby3LvrWEhB3g mQrxItt8ZF4ZLYjOAQoFL4WnVUoLcoV9DjD2o= Received: by 10.68.134.228 with SMTP id pn4mr57336149pbb.52.1328620863764; Tue, 07 Feb 2012 05:21:03 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id o7sm46557264pbq.8.2012.02.07.05.21.00 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Feb 2012 05:21:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 7 Feb 2012 14:20:52 +0100 Message-Id: <1328620852-17883-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: aliguori@us.ibm.com Subject: Re: [Qemu-devel] [PATCH v2 00/27] next steps for qdev & QOM 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 Hi Anthony, I fixed the two nits you found (static in the middle of the file, and *strchr) and dropped the OMAP patches for now to give more time to Peter and Andrzej. I also fixed object_dynamic_cast with TYPE_OBJECT as the target. With this fix, you can actually browse the OMAP clocks with qom-list. The fix requires no changes in the OMAP patches. The following changes since commit c9344f2220ec9878493af5a39b7f0f337e58123a: Fix build breakage from last commit. (2012-02-03 11:22:35 -0600) are available in the git repository at: git://github.com/bonzini/qemu.git qdev-props-for-anthony I'm attaching the interdiff between v2 and v3. Thanks for the quick review! Paolo Paolo Bonzini (25): qom: clean up cast macros qom: more documentation on subclassing qom: clean up/optimize object_dynamic_cast qom: avoid useless conversions from string to type qom: do not include qdev header file qom: add QObject-based property get/set wrappers qom: add property get/set wrappers for C types qom: fix off-by-one qom: add object_resolve_path_type qom: use object_resolve_path_type for links qom: fix canonical paths vs. interfaces qom: add property get/set wrappers for links qdev: remove direct calls to print/parse qdev: allow reusing get/set for legacy property qdev: remove parse method for string properties qdev: remove print/parse methods from LostTickPolicy properties qdev: remove parse/print methods for mac properties qdev: make the non-legacy pci address property accept an integer qdev: remove parse/print methods for pointer properties qdev: let QOM free properties qdev: fix off-by-one qdev: access properties via QOM qdev: inline qdev_prop_set into qdev_prop_set_ptr qdev: initialize properties via QOM qdev: remove unused fields from PropertyInfo hw/qdev-addr.c | 7 +- hw/qdev-monitor.c | 30 ++-- hw/qdev-properties.c | 510 ++++++++++++++++++++++---------------------- hw/qdev.c | 32 ++-- hw/qdev.h | 39 +--- include/qemu/object.h | 217 ++++++++++++++++++- include/qemu/qom-qobject.h | 42 ++++ qemu-common.h | 1 + qerror.c | 4 + qerror.h | 3 + qmp.c | 18 +-- qom/Makefile | 2 +- qom/object.c | 263 ++++++++++++++++++----- qom/qom-qobject.c | 44 ++++ 14 files changed, 810 insertions(+), 402 deletions(-) create mode 100644 include/qemu/qom-qobject.h create mode 100644 qom/qom-qobject.c diff --git a/qom/object.c b/qom/object.c index e92d4a6..aa7e038 100644 --- a/qom/object.c +++ b/qom/object.c @@ -69,6 +69,8 @@ typedef struct Interface #define INTERFACE(obj) OBJECT_CHECK(Interface, obj, TYPE_INTERFACE) +static Type type_interface; + static GHashTable *type_table_get(void) { static GHashTable *type_table; @@ -374,11 +376,9 @@ void object_delete(Object *obj) g_free(obj); } -static Type type_interface; - -static bool object_is_type(Object *obj, TypeImpl *target_type) +static bool type_is_ancestor(TypeImpl *type, TypeImpl *target_type) { - TypeImpl *type = obj->class->type; + assert(target_type); /* Check if typename is a direct ancestor of type */ while (type) { @@ -392,21 +392,28 @@ static bool object_is_type(Object *obj, TypeImpl *target_type) return false; } +static bool object_is_type(Object *obj, TypeImpl *target_type) +{ + return !target_type || type_is_ancestor(obj->class->type, target_type); +} + Object *object_dynamic_cast(Object *obj, const char *typename) { TypeImpl *target_type = type_get_by_name(typename); GSList *i; - /* Check if typename is a direct ancestor */ - if (object_is_type(obj, target_type)) { + /* Check if typename is a direct ancestor. Special-case TYPE_OBJECT, + * we want to go back from interfaces to the parent. + */ + if (target_type && object_is_type(obj, target_type)) { return obj; } /* Check if obj is an interface and its containing object is a direct * ancestor of typename. In principle we could do this test at the very * beginning of object_dynamic_cast, avoiding a second call to * object_is_type. However, casting between interfaces is relatively - * rare, and object_is_type(obj, TYPE_INTERFACE) would fail almost always. + * rare, and object_is_type(obj, type_interface) would fail almost always. * * Perhaps we could add a magic value to the object header for increased * (run-time) type safety and to speed up tests like this one. If we ever @@ -420,6 +427,10 @@ Object *object_dynamic_cast(Object *obj, const char *typename) } } + if (!target_type) { + return obj; + } + /* Check if obj has an interface of typename */ for (i = obj->interfaces; i; i = i->next) { Interface *iface = i->data; @@ -873,8 +884,8 @@ static void object_set_link_property(Object *obj, Visitor *v, void *opaque, if (strcmp(path, "") != 0) { Object *target; - target_type = g_strdup(&type[5]); - *strchr(target_type, '>') = 0; + /* Go from link to FOO. */ + target_type = g_strndup(&type[5], strlen(type) - 6); target = object_resolve_path_type(path, target_type, &ambiguous); if (ambiguous) {