mirror of
https://github.com/qemu/qemu.git
synced 2026-07-08 17:56:38 +00:00
qom: replace 'can_be_deleted' with 'prepare_delete'
While most objects can perform all their cleanup in the finalizer method, there can be interactions with other resources / subsystems / threads which require that some cleanup be performed on an user creatable object before unparenting it and entering finalization. The current 'can_be_deleted' method runs in the deletion path and is intended to be used to block deletion. While it could be used to perform cleanup tasks, its name suggests it should be free of side-effects. Generalize this by renaming it to 'prepare_delete', explicitly allowing for cleanup to be provided. Existing users of 'can_be_deleted' are re-written, which provides them with more detailed/tailored error messages. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-ID: <20260706135824.2623960-2-berrange@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
committed by
Markus Armbruster
parent
94826ec137
commit
9c3b2c9db5
@@ -454,9 +454,15 @@ bool cryptodev_backend_is_ready(CryptoDevBackend *backend)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
cryptodev_backend_can_be_deleted(UserCreatable *uc)
|
cryptodev_backend_prepare_delete(UserCreatable *uc, Error **errp)
|
||||||
{
|
{
|
||||||
return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc));
|
if (cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc))) {
|
||||||
|
error_setg(errp,
|
||||||
|
"Cannot delete cryptodev backend '%s' that is in use",
|
||||||
|
object_get_canonical_path_component(OBJECT(uc)));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cryptodev_backend_instance_init(Object *obj)
|
static void cryptodev_backend_instance_init(Object *obj)
|
||||||
@@ -613,7 +619,7 @@ cryptodev_backend_class_init(ObjectClass *oc, const void *data)
|
|||||||
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
|
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
|
||||||
|
|
||||||
ucc->complete = cryptodev_backend_complete;
|
ucc->complete = cryptodev_backend_complete;
|
||||||
ucc->can_be_deleted = cryptodev_backend_can_be_deleted;
|
ucc->prepare_delete = cryptodev_backend_prepare_delete;
|
||||||
|
|
||||||
QTAILQ_INIT(&crypto_clients);
|
QTAILQ_INIT(&crypto_clients);
|
||||||
object_class_property_add(oc, "queues", "uint32",
|
object_class_property_add(oc, "queues", "uint32",
|
||||||
|
|||||||
@@ -434,9 +434,12 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
host_memory_backend_can_be_deleted(UserCreatable *uc)
|
host_memory_backend_prepare_delete(UserCreatable *uc, Error **errp)
|
||||||
{
|
{
|
||||||
if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) {
|
if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) {
|
||||||
|
error_setg(errp,
|
||||||
|
"Cannot delete host memory backend '%s' which is mapped",
|
||||||
|
object_get_canonical_path_component(OBJECT(uc)));
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
@@ -508,7 +511,7 @@ host_memory_backend_class_init(ObjectClass *oc, const void *data)
|
|||||||
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
|
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
|
||||||
|
|
||||||
ucc->complete = host_memory_backend_memory_complete;
|
ucc->complete = host_memory_backend_memory_complete;
|
||||||
ucc->can_be_deleted = host_memory_backend_can_be_deleted;
|
ucc->prepare_delete = host_memory_backend_prepare_delete;
|
||||||
|
|
||||||
object_class_property_add_bool(oc, "merge",
|
object_class_property_add_bool(oc, "merge",
|
||||||
host_memory_backend_get_merge,
|
host_memory_backend_get_merge,
|
||||||
|
|||||||
@@ -63,11 +63,16 @@ static void iommufd_backend_set_fd(Object *obj, const char *str, Error **errp)
|
|||||||
trace_iommu_backend_set_fd(be->fd);
|
trace_iommu_backend_set_fd(be->fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool iommufd_backend_can_be_deleted(UserCreatable *uc)
|
static bool iommufd_backend_prepare_delete(UserCreatable *uc, Error **errp)
|
||||||
{
|
{
|
||||||
IOMMUFDBackend *be = IOMMUFD_BACKEND(uc);
|
IOMMUFDBackend *be = IOMMUFD_BACKEND(uc);
|
||||||
|
|
||||||
return !be->users;
|
if (be->users) {
|
||||||
|
error_setg(errp, "Can not delete IOMMUFD backend '%s' with %d users",
|
||||||
|
object_get_canonical_path_component(OBJECT(uc)), be->users);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void iommufd_backend_complete(UserCreatable *uc, Error **errp)
|
static void iommufd_backend_complete(UserCreatable *uc, Error **errp)
|
||||||
@@ -92,7 +97,7 @@ static void iommufd_backend_class_init(ObjectClass *oc, const void *data)
|
|||||||
{
|
{
|
||||||
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
|
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
|
||||||
|
|
||||||
ucc->can_be_deleted = iommufd_backend_can_be_deleted;
|
ucc->prepare_delete = iommufd_backend_prepare_delete;
|
||||||
ucc->complete = iommufd_backend_complete;
|
ucc->complete = iommufd_backend_complete;
|
||||||
|
|
||||||
object_class_property_add_str(oc, "fd", NULL, iommufd_backend_set_fd);
|
object_class_property_add_str(oc, "fd", NULL, iommufd_backend_set_fd);
|
||||||
|
|||||||
@@ -960,9 +960,15 @@ static void throttle_group_get_limits(Object *obj, Visitor *v,
|
|||||||
visit_type_ThrottleLimits(v, name, &argp, errp);
|
visit_type_ThrottleLimits(v, name, &argp, errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool throttle_group_can_be_deleted(UserCreatable *uc)
|
static bool throttle_group_prepare_delete(UserCreatable *uc, Error **errp)
|
||||||
{
|
{
|
||||||
return OBJECT(uc)->ref == 1;
|
if (OBJECT(uc)->ref > 1) {
|
||||||
|
error_setg(errp,
|
||||||
|
"Cannot delete throttle group '%s' with active references",
|
||||||
|
object_get_canonical_path_component(OBJECT(uc)));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void throttle_group_obj_class_init(ObjectClass *klass,
|
static void throttle_group_obj_class_init(ObjectClass *klass,
|
||||||
@@ -972,7 +978,7 @@ static void throttle_group_obj_class_init(ObjectClass *klass,
|
|||||||
UserCreatableClass *ucc = USER_CREATABLE_CLASS(klass);
|
UserCreatableClass *ucc = USER_CREATABLE_CLASS(klass);
|
||||||
|
|
||||||
ucc->complete = throttle_group_obj_complete;
|
ucc->complete = throttle_group_obj_complete;
|
||||||
ucc->can_be_deleted = throttle_group_can_be_deleted;
|
ucc->prepare_delete = throttle_group_prepare_delete;
|
||||||
|
|
||||||
/* individual properties */
|
/* individual properties */
|
||||||
for (i = 0; i < sizeof(properties) / sizeof(ThrottleParamInfo); i++) {
|
for (i = 0; i < sizeof(properties) / sizeof(ThrottleParamInfo); i++) {
|
||||||
|
|||||||
@@ -85,13 +85,13 @@ static void event_loop_base_complete(UserCreatable *uc, Error **errp)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool event_loop_base_can_be_deleted(UserCreatable *uc)
|
static bool event_loop_base_prepare_delete(UserCreatable *uc, Error **errp)
|
||||||
{
|
{
|
||||||
EventLoopBaseClass *bc = EVENT_LOOP_BASE_GET_CLASS(uc);
|
EventLoopBaseClass *bc = EVENT_LOOP_BASE_GET_CLASS(uc);
|
||||||
EventLoopBase *backend = EVENT_LOOP_BASE(uc);
|
EventLoopBase *backend = EVENT_LOOP_BASE(uc);
|
||||||
|
|
||||||
if (bc->can_be_deleted) {
|
if (bc->prepare_delete) {
|
||||||
return bc->can_be_deleted(backend);
|
return bc->prepare_delete(backend, errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -102,7 +102,7 @@ static void event_loop_base_class_init(ObjectClass *klass,
|
|||||||
{
|
{
|
||||||
UserCreatableClass *ucc = USER_CREATABLE_CLASS(klass);
|
UserCreatableClass *ucc = USER_CREATABLE_CLASS(klass);
|
||||||
ucc->complete = event_loop_base_complete;
|
ucc->complete = event_loop_base_complete;
|
||||||
ucc->can_be_deleted = event_loop_base_can_be_deleted;
|
ucc->prepare_delete = event_loop_base_prepare_delete;
|
||||||
|
|
||||||
object_class_property_add(klass, "aio-max-batch", "int",
|
object_class_property_add(klass, "aio-max-batch", "int",
|
||||||
event_loop_base_get_param,
|
event_loop_base_get_param,
|
||||||
|
|||||||
@@ -20,8 +20,10 @@ typedef struct UserCreatable UserCreatable;
|
|||||||
* UserCreatableClass:
|
* UserCreatableClass:
|
||||||
* @parent_class: the base class
|
* @parent_class: the base class
|
||||||
* @complete: callback to be called after @obj's properties are set.
|
* @complete: callback to be called after @obj's properties are set.
|
||||||
* @can_be_deleted: callback to be called before an object is removed
|
* @prepare_delete: to be called before an attempt to delete @obj
|
||||||
* to check if @obj can be removed safely.
|
* to validate whether the object can be deleted and trigger any
|
||||||
|
* cleanup of any resources which have to be dealt with before the
|
||||||
|
* object is unparented and enters finalization.
|
||||||
*
|
*
|
||||||
* Interface is designed to work with -object/object-add/object_add
|
* Interface is designed to work with -object/object-add/object_add
|
||||||
* commands.
|
* commands.
|
||||||
@@ -36,7 +38,9 @@ typedef struct UserCreatable UserCreatable;
|
|||||||
* For objects created without using -object/object-add/object_add,
|
* For objects created without using -object/object-add/object_add,
|
||||||
* @user_creatable_complete() wrapper should be called manually if
|
* @user_creatable_complete() wrapper should be called manually if
|
||||||
* object's type implements USER_CREATABLE interface and needs
|
* object's type implements USER_CREATABLE interface and needs
|
||||||
* complete() callback to be called.
|
* complete() callback to be called. Similarly @user_creatable_prepare_delete()
|
||||||
|
* should be called manually prior to an attempt to the delete the
|
||||||
|
* object.
|
||||||
*/
|
*/
|
||||||
struct UserCreatableClass {
|
struct UserCreatableClass {
|
||||||
/* <private> */
|
/* <private> */
|
||||||
@@ -44,7 +48,7 @@ struct UserCreatableClass {
|
|||||||
|
|
||||||
/* <public> */
|
/* <public> */
|
||||||
void (*complete)(UserCreatable *uc, Error **errp);
|
void (*complete)(UserCreatable *uc, Error **errp);
|
||||||
bool (*can_be_deleted)(UserCreatable *uc);
|
bool (*prepare_delete)(UserCreatable *uc, Error **errp);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -61,13 +65,17 @@ struct UserCreatableClass {
|
|||||||
bool user_creatable_complete(UserCreatable *uc, Error **errp);
|
bool user_creatable_complete(UserCreatable *uc, Error **errp);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* user_creatable_can_be_deleted:
|
* user_creatable_prepare_delete:
|
||||||
* @uc: the object whose can_be_deleted() method is called if implemented
|
* @uc: the user-creatable object whose prepare_delete() method is called
|
||||||
|
* @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
|
* Wrapper to call prepare_delete() class method if defined, otherwise
|
||||||
* from implements USER_CREATABLE interface.
|
* does nothing.
|
||||||
|
*
|
||||||
|
* Returns: %true on success or if prepare_delete() is not defined,
|
||||||
|
* %false on failure.
|
||||||
*/
|
*/
|
||||||
bool user_creatable_can_be_deleted(UserCreatable *uc);
|
bool user_creatable_prepare_delete(UserCreatable *uc, Error **errp);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* user_creatable_add_qapi:
|
* user_creatable_add_qapi:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ struct EventLoopBaseClass {
|
|||||||
|
|
||||||
void (*init)(EventLoopBase *base, Error **errp);
|
void (*init)(EventLoopBase *base, Error **errp);
|
||||||
void (*update_params)(EventLoopBase *base, Error **errp);
|
void (*update_params)(EventLoopBase *base, Error **errp);
|
||||||
bool (*can_be_deleted)(EventLoopBase *base);
|
bool (*prepare_delete)(EventLoopBase *base, Error **errp);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EventLoopBase {
|
struct EventLoopBase {
|
||||||
|
|||||||
@@ -143,8 +143,10 @@ int can_bus_client_set_filters(CanBusClientState *client,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static bool can_bus_can_be_deleted(UserCreatable *uc)
|
static bool can_bus_prepare_delete(UserCreatable *uc, Error **errp)
|
||||||
{
|
{
|
||||||
|
error_setg(errp, "Deleting CAN bus device '%s' is not supported",
|
||||||
|
object_get_canonical_path_component(OBJECT(uc)));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,7 +155,7 @@ static void can_bus_class_init(ObjectClass *klass,
|
|||||||
{
|
{
|
||||||
UserCreatableClass *uc_klass = USER_CREATABLE_CLASS(klass);
|
UserCreatableClass *uc_klass = USER_CREATABLE_CLASS(klass);
|
||||||
|
|
||||||
uc_klass->can_be_deleted = can_bus_can_be_deleted;
|
uc_klass->prepare_delete = can_bus_prepare_delete;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo can_bus_info = {
|
static const TypeInfo can_bus_info = {
|
||||||
|
|||||||
@@ -32,16 +32,14 @@ bool user_creatable_complete(UserCreatable *uc, Error **errp)
|
|||||||
return !*errp;
|
return !*errp;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool user_creatable_can_be_deleted(UserCreatable *uc)
|
bool user_creatable_prepare_delete(UserCreatable *uc, Error **errp)
|
||||||
{
|
{
|
||||||
|
|
||||||
UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);
|
UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);
|
||||||
|
|
||||||
if (ucc->can_be_deleted) {
|
if (ucc->prepare_delete) {
|
||||||
return ucc->can_be_deleted(uc);
|
return ucc->prepare_delete(uc, errp);
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void user_creatable_add_qapi(ObjectOptions *options, Error **errp)
|
void user_creatable_add_qapi(ObjectOptions *options, Error **errp)
|
||||||
@@ -253,8 +251,7 @@ bool user_creatable_del(const char *id, Error **errp)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!user_creatable_can_be_deleted(USER_CREATABLE(obj))) {
|
if (!user_creatable_prepare_delete(USER_CREATABLE(obj), errp)) {
|
||||||
error_setg(errp, "object '%s' is in use, can not be deleted", id);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -801,7 +801,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
|
|||||||
# Now group1 is in use, it cannot be deleted
|
# Now group1 is in use, it cannot be deleted
|
||||||
result = self.vm.qmp('object-del', id = 'group1')
|
result = self.vm.qmp('object-del', id = 'group1')
|
||||||
self.assert_qmp(result, 'error/class', 'GenericError')
|
self.assert_qmp(result, 'error/class', 'GenericError')
|
||||||
self.assert_qmp(result, 'error/desc', "object 'group1' is in use, can not be deleted")
|
self.assert_qmp(result, 'error/desc', "Cannot delete throttle group 'group1' with active references")
|
||||||
|
|
||||||
# Default options, this switches the group back to group0
|
# Default options, this switches the group back to group0
|
||||||
self.reopen(opts)
|
self.reopen(opts)
|
||||||
@@ -809,7 +809,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
|
|||||||
# So now we cannot delete group0
|
# So now we cannot delete group0
|
||||||
result = self.vm.qmp('object-del', id = 'group0')
|
result = self.vm.qmp('object-del', id = 'group0')
|
||||||
self.assert_qmp(result, 'error/class', 'GenericError')
|
self.assert_qmp(result, 'error/class', 'GenericError')
|
||||||
self.assert_qmp(result, 'error/desc', "object 'group0' is in use, can not be deleted")
|
self.assert_qmp(result, 'error/desc', "Cannot delete throttle group 'group0' with active references")
|
||||||
|
|
||||||
# But group1 is free this time, and it can be deleted
|
# But group1 is free this time, and it can be deleted
|
||||||
self.vm.cmd('object-del', id = 'group1')
|
self.vm.cmd('object-del', id = 'group1')
|
||||||
|
|||||||
@@ -218,8 +218,10 @@ static void main_loop_init(EventLoopBase *base, Error **errp)
|
|||||||
mloop = m;
|
mloop = m;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool main_loop_can_be_deleted(EventLoopBase *base)
|
static bool main_loop_prepare_delete(EventLoopBase *base, Error **errp)
|
||||||
{
|
{
|
||||||
|
error_setg(errp, "Deleting main loop '%s' is not supported",
|
||||||
|
object_get_canonical_path_component(OBJECT(base)));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -229,7 +231,7 @@ static void main_loop_class_init(ObjectClass *oc, const void *class_data)
|
|||||||
|
|
||||||
bc->init = main_loop_init;
|
bc->init = main_loop_init;
|
||||||
bc->update_params = main_loop_update_params;
|
bc->update_params = main_loop_update_params;
|
||||||
bc->can_be_deleted = main_loop_can_be_deleted;
|
bc->prepare_delete = main_loop_prepare_delete;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo main_loop_info = {
|
static const TypeInfo main_loop_info = {
|
||||||
|
|||||||
Reference in New Issue
Block a user