Commit 3beacfb9 authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

qom: Remove unused errp parameter from can_be_deleted() 



The errp argument is ignored by all implementations of the
method, and user_creatable_del() would break if any
implementation set an error (because it calls error_setg(errp) if
the function returns false).  Remove the unused parameter.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170829220337.23427-1-ehabkost@redhat.com>
Reviewed-by: default avatarGonglei <arei.gonglei@huawei.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 223cd0e1

backends/cryptodev.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ bool cryptodev_backend_is_ready(CryptoDevBackend *backend) 
}



static bool

cryptodev_backend_can_be_deleted(UserCreatable *uc, Error **errp)

cryptodev_backend_can_be_deleted(UserCreatable *uc)

{

    return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc));

}

backends/hostmem.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ out: 
}



static bool

host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp)

host_memory_backend_can_be_deleted(UserCreatable *uc)

{

    if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) {

        return false;

include/qom/object_interfaces.h

+2 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ typedef struct UserCreatableClass { 


    /* <public> */

    void (*complete)(UserCreatable *uc, Error **errp);

    bool (*can_be_deleted)(UserCreatable *uc, Error **errp);

    bool (*can_be_deleted)(UserCreatable *uc);

} UserCreatableClass;



/**
@@ -68,12 +68,11 @@ void user_creatable_complete(Object *obj, Error **errp); 
/**

 * user_creatable_can_be_deleted:

 * @uc: the object whose can_be_deleted() method is called if implemented

 * @errp: if an error occurs, a pointer to an area to store the error

 *

 * Wrapper to call can_be_deleted() method if one of types it's inherited

 * from implements USER_CREATABLE interface.

 */

bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp);

bool user_creatable_can_be_deleted(UserCreatable *uc);



/**

 * user_creatable_add_type:

qom/object_interfaces.c

+3 −3
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ void user_creatable_complete(Object *obj, Error **errp) 
    }

}



bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp)

bool user_creatable_can_be_deleted(UserCreatable *uc)

{



    UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);



    if (ucc->can_be_deleted) {

        return ucc->can_be_deleted(uc, errp);

        return ucc->can_be_deleted(uc);

    } else {

        return true;

    }
@@ -178,7 +178,7 @@ void user_creatable_del(const char *id, Error **errp) 
        return;

    }



    if (!user_creatable_can_be_deleted(USER_CREATABLE(obj), errp)) {

    if (!user_creatable_can_be_deleted(USER_CREATABLE(obj))) {

        error_setg(errp, "object '%s' is in use, can not be deleted", id);

        return;

    }