From patchwork Mon Oct 22 15:03:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 193237 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BF1EF2C0100 for ; Tue, 23 Oct 2012 04:00:58 +1100 (EST) Received: from localhost ([::1]:43784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQLN3-0004b5-2B for incoming@patchwork.ozlabs.org; Mon, 22 Oct 2012 13:00:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJZU-0004CR-BM for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:05:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQJZM-0001H8-5D for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:05:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJZL-0001GM-SZ for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:05:32 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9MF5956016292 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 22 Oct 2012 11:05:09 -0400 Received: from nial.brq.redhat.com (dhcp-1-247.brq.redhat.com [10.34.1.247]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9MF3OnY031350; Mon, 22 Oct 2012 11:05:06 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 22 Oct 2012 17:03:19 +0200 Message-Id: <1350918203-25198-34-git-send-email-imammedo@redhat.com> In-Reply-To: <1350918203-25198-1-git-send-email-imammedo@redhat.com> References: <1350918203-25198-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 33/37] qdev: QDEV_PROP_FOREACH and QDEV_CLASS_FOREACH 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 helpers to iterate over device static properties to allow to simplify code a little. Signed-off-by: Igor Mammedov --- hw/qdev-properties.h | 9 +++++++++ qom/qdev-core.c | 10 ++++------ qom/qdev-properties.c | 29 +++++++---------------------- 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/hw/qdev-properties.h b/hw/qdev-properties.h index 41358fa..19b55c0 100644 --- a/hw/qdev-properties.h +++ b/hw/qdev-properties.h @@ -135,4 +135,13 @@ void qdev_property_add_static(DeviceState *dev, Property *prop, Error **errp); const Property *qdev_prop_find(const DeviceClass *dc, const char *name); +#define QDEV_PROP_FOREACH(_var, _class) \ + for ((_var) = DEVICE_CLASS((_class))->props; \ + (_var) && (_var)->name; \ + (_var)++) + +#define QDEV_CLASS_FOREACH(_var, _class) \ + for ((_var) = (_class); \ + (_var) != DEVICE_CLASS(object_class_by_name(TYPE_DEVICE)); \ + (_var) = DEVICE_CLASS(object_class_get_parent(OBJECT_CLASS((_var))))) #endif diff --git a/qom/qdev-core.c b/qom/qdev-core.c index fbb7cb5..a062dbb 100644 --- a/qom/qdev-core.c +++ b/qom/qdev-core.c @@ -592,7 +592,7 @@ void qdev_property_add_static(DeviceState *dev, Property *prop, static void device_initfn(Object *obj) { DeviceState *dev = DEVICE(obj); - ObjectClass *class; + DeviceClass *dc = DEVICE_CLASS(object_get_class(OBJECT(dev))); Property *prop; if (qdev_hotplug) { @@ -603,14 +603,12 @@ static void device_initfn(Object *obj) dev->instance_id_alias = -1; dev->state = DEV_STATE_CREATED; - class = object_get_class(OBJECT(dev)); - do { - for (prop = DEVICE_CLASS(class)->props; prop && prop->name; prop++) { + QDEV_CLASS_FOREACH(dc, dc) { + QDEV_PROP_FOREACH(prop, dc) { qdev_property_add_legacy(dev, prop, NULL); qdev_property_add_static(dev, prop, NULL); } - class = object_class_get_parent(class); - } while (class != object_class_by_name(TYPE_DEVICE)); + } qdev_prop_set_globals(dev); object_property_add_link(OBJECT(dev), "parent_bus", TYPE_BUS, diff --git a/qom/qdev-properties.c b/qom/qdev-properties.c index cc37479..3d3eefa 100644 --- a/qom/qdev-properties.c +++ b/qom/qdev-properties.c @@ -772,33 +772,18 @@ PropertyInfo qdev_prop_pci_host_devaddr = { /* --- public helpers --- */ -static Property *qdev_prop_walk(Property *props, const char *name) -{ - if (!props) - return NULL; - while (props->name) { - if (strcmp(props->name, name) == 0) - return props; - props++; - } - return NULL; -} - const Property *qdev_prop_find(const DeviceClass *dc, const char *name) { - ObjectClass *class; - Property *prop; + const Property *prop; /* device properties */ - class = OBJECT_CLASS(dc); - do { - prop = qdev_prop_walk(DEVICE_CLASS(class)->props, name); - if (prop) { - return prop; + QDEV_CLASS_FOREACH(dc, dc) { + QDEV_PROP_FOREACH(prop, dc) { + if (strcmp(prop->name, name) == 0) { + return prop; + } } - class = object_class_get_parent(class); - } while (class != object_class_by_name(TYPE_DEVICE)); - + } return NULL; }