From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZSGP-0007Wr-2x for qemu-devel@nongnu.org; Mon, 06 May 2013 16:44:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZSG9-0005CA-DJ for qemu-devel@nongnu.org; Mon, 06 May 2013 16:44:00 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48363 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZSG9-0005Bz-2o for qemu-devel@nongnu.org; Mon, 06 May 2013 16:43:45 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8D4E5A3DDF for ; Mon, 6 May 2013 22:43:44 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 6 May 2013 22:43:27 +0200 Message-Id: <1367873011-7402-8-git-send-email-afaerber@suse.de> In-Reply-To: <1367873011-7402-1-git-send-email-afaerber@suse.de> References: <1367873011-7402-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 07/11] qdev: Introduce qdev_prop_set_globals_for_type() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Reuse it in qdev_prop_set_globals(). Reviewed-by: Eduardo Habkost [AF: Renamed from qdev_prop_set_custom_globals()] Signed-off-by: Andreas F=C3=A4rber --- hw/core/qdev-properties.c | 36 +++++++++++++++++++++++++----------- include/hw/qdev-properties.h | 2 ++ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 716ba19..3a324fb 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1099,23 +1099,37 @@ void qdev_prop_register_global_list(GlobalPropert= y *props) } } =20 +void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typena= me, + Error **errp) +{ + GlobalProperty *prop; + + QTAILQ_FOREACH(prop, &global_props, next) { + Error *err =3D NULL; + + if (strcmp(typename, prop->driver) !=3D 0) { + continue; + } + qdev_prop_parse(dev, prop->property, prop->value, &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } + } +} + void qdev_prop_set_globals(DeviceState *dev, Error **errp) { ObjectClass *class =3D object_get_class(OBJECT(dev)); =20 do { - GlobalProperty *prop; - QTAILQ_FOREACH(prop, &global_props, next) { - Error *err =3D NULL; + Error *err =3D NULL; =20 - if (strcmp(object_class_get_name(class), prop->driver) !=3D = 0) { - continue; - } - qdev_prop_parse(dev, prop->property, prop->value, &err); - if (err !=3D NULL) { - error_propagate(errp, err); - return; - } + qdev_prop_set_globals_for_type(dev, object_class_get_name(class)= , + &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; } class =3D object_class_get_parent(class); } while (class); diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 38469d4..39448b7 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -169,6 +169,8 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *= name, void *value); void qdev_prop_register_global(GlobalProperty *prop); void qdev_prop_register_global_list(GlobalProperty *props); void qdev_prop_set_globals(DeviceState *dev, Error **errp); +void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typena= me, + Error **errp); void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *= dev, Property *prop, const char *value); =20 --=20 1.8.1.4