From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgcUx-0001fg-07 for qemu-devel@nongnu.org; Mon, 18 Jun 2012 10:00:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SgcUh-0003Zg-8C for qemu-devel@nongnu.org; Mon, 18 Jun 2012 10:00:06 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53295 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgcUg-0003Z6-RY for qemu-devel@nongnu.org; Mon, 18 Jun 2012 09:59:51 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 18 Jun 2012 15:59:13 +0200 Message-Id: <1340027954-19045-22-git-send-email-afaerber@suse.de> In-Reply-To: <1340027954-19045-1-git-send-email-afaerber@suse.de> References: <1340027954-19045-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 21/22] qdev: Remove qdev_prop_exists() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori From: Paolo Bonzini Can be replaced everywhere with object_property_find(). Signed-off-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- hw/qdev-properties.c | 5 ----- hw/qdev.c | 2 +- hw/qdev.h | 1 - hw/scsi-bus.c | 2 +- include/qemu/object.h | 9 +++++++++ qom/object.c | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index f4b9a0e..099a7aa 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -931,11 +931,6 @@ static Property *qdev_prop_find(DeviceState *dev, co= nst char *name) return NULL; } =20 -int qdev_prop_exists(DeviceState *dev, const char *name) -{ - return qdev_prop_find(dev, name) ? true : false; -} - void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *= dev, Property *prop, const char *value) { diff --git a/hw/qdev.c b/hw/qdev.c index 38ca581..654cbca 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -323,7 +323,7 @@ void qdev_set_nic_properties(DeviceState *dev, NICInf= o *nd) if (nd->netdev) qdev_prop_set_netdev(dev, "netdev", nd->netdev); if (nd->nvectors !=3D DEV_NVECTORS_UNSPECIFIED && - qdev_prop_exists(dev, "vectors")) { + object_property_find(OBJECT(dev), "vectors")) { qdev_prop_set_uint32(dev, "vectors", nd->nvectors); } nd->instantiated =3D 1; diff --git a/hw/qdev.h b/hw/qdev.h index e39f82e..ae1d281 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -306,7 +306,6 @@ extern PropertyInfo qdev_prop_blocksize; =20 /* Set properties between creation and init. */ void *qdev_get_prop_ptr(DeviceState *dev, Property *prop); -int qdev_prop_exists(DeviceState *dev, const char *name); int qdev_prop_parse(DeviceState *dev, const char *name, const char *valu= e); void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value); void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t val= ue); diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index dbfccdc..a4ae44b 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -214,7 +214,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, B= lockDriverState *bdrv, if (bootindex >=3D 0) { qdev_prop_set_int32(dev, "bootindex", bootindex); } - if (qdev_prop_exists(dev, "removable")) { + if (object_property_find(OBJECT(dev), "removable")) { qdev_prop_set_bit(dev, "removable", removable); } if (qdev_prop_set_drive(dev, "drive", bdrv) < 0) { diff --git a/include/qemu/object.h b/include/qemu/object.h index b16d99b..8cac7da 100644 --- a/include/qemu/object.h +++ b/include/qemu/object.h @@ -635,6 +635,15 @@ void object_property_add(Object *obj, const char *na= me, const char *type, =20 void object_property_del(Object *obj, const char *name, struct Error **e= rrp); =20 +/** + * object_property_find: + * @obj: the object + * @name: the name of the property + * + * Look up a property for an object and return its #ObjectProperty if fo= und. + */ +ObjectProperty *object_property_find(Object *obj, const char *name); + void object_unparent(Object *obj); =20 /** diff --git a/qom/object.c b/qom/object.c index 27cc651..e072e89 100644 --- a/qom/object.c +++ b/qom/object.c @@ -672,7 +672,7 @@ void object_property_add(Object *obj, const char *nam= e, const char *type, QTAILQ_INSERT_TAIL(&obj->properties, prop, node); } =20 -static ObjectProperty *object_property_find(Object *obj, const char *nam= e) +ObjectProperty *object_property_find(Object *obj, const char *name) { ObjectProperty *prop; =20 --=20 1.7.7