Commit 8cb6789a authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Andreas Färber
Browse files

qdev: Remove qdev_prop_exists() 



Can be replaced everywhere with object_property_find().

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent ac7d1ba6

hw/qdev-properties.c

+0 −5
Original line number Diff line number Diff line
@@ -931,11 +931,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)

{

hw/qdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

hw/qdev.h

+0 −1
Original line number Diff line number Diff line
@@ -306,7 +306,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);

hw/scsi-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

include/qemu/object.h

+9 −0
Original line number Diff line number Diff line
@@ -635,6 +635,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);



/**