[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 5/9] qom: trace asserting casts
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH for-1.5 5/9] qom: trace asserting casts |
Date: |
Fri, 10 May 2013 14:16:39 +0200 |
This provides a way to detect the cast that leads to a (reproducible)
crash even when QOM cast debugging is disabled.
Signed-off-by: Paolo Bonzini <address@hidden>
---
qom/object.c | 10 +++++++++-
trace-events | 3 +++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/qom/object.c b/qom/object.c
index bca6219..1b9c5ce 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -16,6 +16,7 @@
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
#include "qapi/qmp/qerror.h"
+#include "trace.h"
/* TODO: replace QObject with a simpler visitor to avoid a dependency
* of the QOM core on QObject? */
@@ -436,6 +437,9 @@ Object *object_dynamic_cast_assert(Object *obj, const char
*typename,
{
Object *inst;
+ trace_object_dynamic_cast_assert(obj ? obj->class->type->name : "(null)",
+ typename, file, line, func);
+
inst = object_dynamic_cast(obj, typename);
if (!inst && obj) {
@@ -500,8 +504,12 @@ ObjectClass *object_class_dynamic_cast_assert(ObjectClass
*class,
const char *file, int line,
const char *func)
{
- ObjectClass *ret = object_class_dynamic_cast(class, typename);
+ ObjectClass *ret;
+
+ trace_object_class_dynamic_cast_assert(class ? class->type->name :
"(null)",
+ typename, file, line, func);
+ ret = object_class_dynamic_cast(class, typename);
if (!ret && class) {
fprintf(stderr, "%s:%d:%s: Object %p is not an instance of type %s\n",
file, line, func, class, typename);
diff --git a/trace-events b/trace-events
index 17d75ab..4413beb 100644
--- a/trace-events
+++ b/trace-events
@@ -1160,3 +1160,6 @@ kvm_vm_ioctl(int type, void *arg) "type %d, arg %p"
kvm_vcpu_ioctl(int cpu_index, int type, void *arg) "cpu_index %d, type %d, arg
%p"
kvm_run_exit(int cpu_index, uint32_t reason) "cpu_index %d, reason %d"
+# qom/object.c
+object_dynamic_cast_assert(const char *type, const char *target, const char
*file, int line, const char *func) "%s->%s (%s:%d:%s)"
+object_class_dynamic_cast_assert(const char *type, const char *target, const
char *file, int line, const char *func) "%s->%s (%s:%d:%s)"
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 1/9] qom: improve documentation of cast functions, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 2/9] qom: allow casting of a NULL class, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 3/9] qom: add a fast path to object_class_dynamic_cast, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 4/9] qom: pass file/line/function to asserting casts, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 5/9] qom: trace asserting casts,
Paolo Bonzini <=
- [Qemu-devel] [PATCH for-1.5 7/9] build: disable QOM cast debugging for official releases, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 6/9] qom: allow turning cast debugging off, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 8/9] qom: simplify object_class_dynamic_cast, part 1, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 9/9] qom: simplify object_class_dynamic_cast, part 2, Paolo Bonzini, 2013/05/10
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Anthony Liguori, 2013/05/10