aboutsummaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2017-08-29 19:03:37 -0300
committerEduardo Habkost <ehabkost@redhat.com>2017-09-01 10:43:07 -0300
commit3beacfb98ba5f594dff4a4541401f2849e0a9ec6 (patch)
tree006850050a15edf9ed00e01587f3004479803f64 /qom
parent223cd0e13f2e46078d7b573f0b8402bfbee339be (diff)
downloadqemu-3beacfb98ba5f594dff4a4541401f2849e0a9ec6.zip
qemu-3beacfb98ba5f594dff4a4541401f2849e0a9ec6.tar.gz
qemu-3beacfb98ba5f594dff4a4541401f2849e0a9ec6.tar.bz2
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>
Diffstat (limited to 'qom')
-rw-r--r--qom/object_interfaces.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index ff27e06..3bb8959 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -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;
}