mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
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: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20170829220337.23427-1-ehabkost@redhat.com> Reviewed-by: Gonglei <arei.gonglei@huawei.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
223cd0e13f
commit
3beacfb98b
4 changed files with 7 additions and 8 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue