[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 9/9] qom: simplify object_class_dynamic_cast
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH for-1.5 9/9] qom: simplify object_class_dynamic_cast, part 2 |
Date: |
Fri, 10 May 2013 14:16:43 +0200 |
Detect ambiguous matches right away, without going through all
interfaces first.
Signed-off-by: Paolo Bonzini <address@hidden>
---
qom/object.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index f82f12c..c69e6a3 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -455,7 +455,6 @@ Object *object_dynamic_cast_assert(Object *obj, const char
*typename,
ObjectClass *object_class_dynamic_cast(ObjectClass *class,
const char *typename)
{
- ObjectClass *ret = NULL;
TypeImpl *target_type;
if (!class) {
@@ -475,27 +474,26 @@ ObjectClass *object_class_dynamic_cast(ObjectClass *class,
if (class->interfaces &&
type_is_ancestor(target_type, type_interface)) {
- int found = 0;
+ ObjectClass *ret = NULL;
GSList *i;
for (i = class->interfaces; i; i = i->next) {
ObjectClass *target_class = i->data;
if (type_is_ancestor(target_class->type, target_type)) {
+ /* If the match is ambiguous, don't allow a cast */
+ if (ret) {
+ ret = NULL;
+ }
ret = target_class;
- found++;
}
}
-
- /* The match was ambiguous, don't allow a cast */
- if (found > 1) {
- ret = NULL;
- }
+ return ret;
} else if (type_is_ancestor(class->type, target_type)) {
- ret = class;
+ return class;
+ } else {
+ return NULL;
}
-
- return ret;
}
ObjectClass *object_class_dynamic_cast_assert(ObjectClass *class,
--
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, 2013/05/10
- [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 <=
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Anthony Liguori, 2013/05/10
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Paolo Bonzini, 2013/05/10
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Andreas Färber, 2013/05/10
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Paolo Bonzini, 2013/05/10
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Aurelien Jarno, 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
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, 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
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Aurelien Jarno, 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