From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXZZA-00036t-7N for qemu-devel@nongnu.org; Wed, 01 May 2013 12:07:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXZZ7-00086z-0A for qemu-devel@nongnu.org; Wed, 01 May 2013 12:07:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32854 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXZZ6-00086o-LC for qemu-devel@nongnu.org; Wed, 01 May 2013 12:07:32 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 1 May 2013 18:07:18 +0200 Message-Id: <1367424440-16687-3-git-send-email-afaerber@suse.de> In-Reply-To: <1367424440-16687-1-git-send-email-afaerber@suse.de> References: <1367424440-16687-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] [PATCH qom-cpu for-1.5 2/4] qdev: Introduce qdev_prop_set_custom_globals() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , ehabkost@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Reuse it in qdev_prop_set_globals(). Signed-off-by: Andreas F=C3=A4rber --- hw/core/qdev-properties.c | 35 ++++++++++++++++++++++++----------- include/hw/qdev-properties.h | 2 ++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 716ba19..68d1bff 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1099,23 +1099,36 @@ void qdev_prop_register_global_list(GlobalPropert= y *props) } } =20 +void qdev_prop_set_custom_globals(DeviceState *dev, const char *driver, + Error **errp) +{ + GlobalProperty *prop; + + QTAILQ_FOREACH(prop, &global_props, next) { + Error *err =3D NULL; + + if (strcmp(driver, 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_custom_globals(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..833300c 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_custom_globals(DeviceState *dev, const char *driver, + 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