Commit df4fe0b2 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qom: Drop @errp parameter of object_property_del() 



Same story as for object_property_add(): the only way
object_property_del() can fail is when the property with this name
does not exist.  Since our property names are all hardcoded, failure
is a programming error, and the appropriate way to handle it is
passing &error_abort.  Most callers do that, the commit before
previous fixed one that didn't (and got the error handling wrong), and
the two remaining exceptions ignore errors.

Drop the @errp parameter.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-19-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 7ef1553d

hw/core/qdev.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void bus_remove_child(BusState *bus, DeviceState *child) 
            bus->num_children--;



            /* This gives back ownership of kid->child back to us.  */

            object_property_del(OBJECT(bus), name, NULL);

            object_property_del(OBJECT(bus), name);

            object_unref(OBJECT(kid->child));

            g_free(kid);

            return;

hw/i386/pc_sysfw.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void pc_system_flash_cleanup_unused(PCMachineState *pcms) 
        dev_obj = OBJECT(pcms->flash[i]);

        if (!object_property_get_bool(dev_obj, "realized", &error_abort)) {

            prop_name = g_strdup_printf("pflash%d", i);

            object_property_del(OBJECT(pcms), prop_name, &error_abort);

            object_property_del(OBJECT(pcms), prop_name);

            g_free(prop_name);

            object_unparent(dev_obj);

            pcms->flash[i] = NULL;

hw/ppc/spapr_drc.c

+2 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static void spapr_drc_release(SpaprDrc *drc) 
    g_free(drc->fdt);

    drc->fdt = NULL;

    drc->fdt_start_offset = 0;

    object_property_del(OBJECT(drc), "device", &error_abort);

    object_property_del(OBJECT(drc), "device");

    drc->dev = NULL;

}
@@ -551,7 +551,7 @@ static void unrealize(DeviceState *d) 
    vmstate_unregister(VMSTATE_IF(drc), &vmstate_spapr_drc, drc);

    root_container = container_get(object_get_root(), DRC_CONTAINER_PATH);

    name = g_strdup_printf("%x", spapr_drc_index(drc));

    object_property_del(root_container, name, &error_abort);

    object_property_del(root_container, name);

    g_free(name);

}

include/qom/object.h

+1 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ ObjectProperty *object_property_add(Object *obj, const char *name, 
                                    ObjectPropertyRelease *release,

                                    void *opaque);



void object_property_del(Object *obj, const char *name, Error **errp);

void object_property_del(Object *obj, const char *name);



ObjectProperty *object_class_property_add(ObjectClass *klass, const char *name,

                                          const char *type,

qom/object.c

+1 −6
Original line number Diff line number Diff line
@@ -1280,15 +1280,10 @@ ObjectProperty *object_class_property_find(ObjectClass *klass, const char *name, 
    return prop;

}



void object_property_del(Object *obj, const char *name, Error **errp)

void object_property_del(Object *obj, const char *name)

{

    ObjectProperty *prop = g_hash_table_lookup(obj->properties, name);



    if (!prop) {

        error_setg(errp, "Property '.%s' not found", name);

        return;

    }



    if (prop->release) {

        prop->release(obj, name, prop->opaque);

    }