Reviewed-by: Marc-André Lureau <[email protected]>
Tested-by: Peter Krempa <[email protected]>
Signed-off-by: Daniel P. Berrangé <[email protected]>
---
qom/object_interfaces.c | 11 +++++++++--
qom/trace-events | 5 +++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index ac992aa786..69bdb1807f 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -20,12 +20,14 @@
#include "qapi/opts-visitor.h"
#include "qemu/config-file.h"
#include "qemu/keyval.h"
+#include "trace.h"
bool user_creatable_complete(UserCreatable *uc, Error **errp)
{
UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);
ERRP_GUARD();
+ trace_user_creatable_complete(uc, object_get_typename(OBJECT(uc)));
if (ucc->complete) {
ucc->complete(uc, errp);
}
@@ -36,11 +38,16 @@ bool user_creatable_prepare_delete(UserCreatable *uc, Error
**errp)
{
UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);
ERRP_GUARD();
+ bool ret = true;
+ trace_user_creatable_prepare_delete(uc, object_get_typename(OBJECT(uc)));
if (ucc->prepare_delete) {
- return ucc->prepare_delete(uc, errp);
+ ret = ucc->prepare_delete(uc, errp);
}
- return true;
+ trace_user_creatable_prepare_delete_result(
+ uc, object_get_typename(OBJECT(uc)),
+ *errp ? error_get_pretty(*errp) : NULL);
+ return ret;
}
void user_creatable_add_qapi(ObjectOptions *options, Error **errp)
diff --git a/qom/trace-events b/qom/trace-events
index 44c63e72af..bac8472618 100644
--- a/qom/trace-events
+++ b/qom/trace-events
@@ -11,3 +11,8 @@ object_property_del_child(void *obj, const char *type, void
*child, const char *
object_property_parse(void *obj, const char *type, const char *name, const
char *value) "obj=%p type=%s prop=%s value=%s"
object_class_dynamic_cast_assert(const char *type, const char *target, const
char *file, int line, const char *func) "type=%s->%s (%s:%d:%s)"
object_class_property_add(const char *type, const char *name, void *value)
"type=%s name=%s value=%p"
+
+# object_interfaces.c
+user_creatable_complete(void *obj, const char *type) "obj=%p type=%s"
+user_creatable_prepare_delete(void *obj, const char *type) "obj=%p type=%s"
+user_creatable_prepare_delete_result(void *obj, const char *type, const char
*msg) "obj=%p type=%s msg=%s"
--
2.54.0
