From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXDkS-0007fU-6G for qemu-devel@nongnu.org; Wed, 23 May 2012 11:45:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXDkH-0007Sx-Ul for qemu-devel@nongnu.org; Wed, 23 May 2012 11:45:15 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:54937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXDkH-0007Og-M4 for qemu-devel@nongnu.org; Wed, 23 May 2012 11:45:05 -0400 Received: by pbbro12 with SMTP id ro12so12013210pbb.4 for ; Wed, 23 May 2012 08:45:03 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 23 May 2012 17:44:33 +0200 Message-Id: <1337787881-3579-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1337787881-3579-1-git-send-email-pbonzini@redhat.com> References: <1337787881-3579-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 02/10] qdev: remove qdev_prop_exists List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: afaerber@suse.de, qemu-devel@nongnu.org Cc: imammedo@redhat.com, peter.maydell@linaro.org Can be replaced everywhere with object_property_find. Signed-off-by: Paolo Bonzini --- 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 af68ca5..eeb950d 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -925,11 +925,6 @@ static Property *qdev_prop_find(DeviceState *dev, const char *name) return NULL; } -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 b5efb16..fc1dfbf 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -323,7 +323,7 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd) if (nd->netdev) qdev_prop_set_netdev(dev, "netdev", nd->netdev); if (nd->nvectors != DEV_NVECTORS_UNSPECIFIED && - qdev_prop_exists(dev, "vectors")) { + object_property_find(OBJECT(dev), "vectors")) { qdev_prop_set_uint32(dev, "vectors", nd->nvectors); } nd->instantiated = 1; diff --git a/hw/qdev.h b/hw/qdev.h index 224875d..212ca24 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -299,7 +299,6 @@ extern PropertyInfo qdev_prop_blocksize; /* 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 *value); void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value); void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t value); diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 2bb19e9..bdb3ca5 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -214,7 +214,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, if (bootindex >= 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 5fd2270..b7efc63 100644 --- a/include/qemu/object.h +++ b/include/qemu/object.h @@ -636,6 +636,15 @@ void object_property_add(Object *obj, const char *name, const char *type, void object_property_del(Object *obj, const char *name, struct Error **errp); +/** + * object_property_find: + * @obj: the object + * @name: the name of the property + * + * Look up a property for an object and return its #ObjectProperty if found. + */ +ObjectProperty *object_property_find(Object *obj, const char *name); + void object_unparent(Object *obj); /** diff --git a/qom/object.c b/qom/object.c index 4b410f1..13fd157 100644 --- a/qom/object.c +++ b/qom/object.c @@ -662,7 +662,7 @@ void object_property_add(Object *obj, const char *name, const char *type, QTAILQ_INSERT_TAIL(&obj->properties, prop, node); } -static ObjectProperty *object_property_find(Object *obj, const char *name) +ObjectProperty *object_property_find(Object *obj, const char *name) { ObjectProperty *prop; -- 1.7.10.1