From patchwork Fri May 10 12:16:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 242974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 940952C00A2 for ; Fri, 10 May 2013 22:20:36 +1000 (EST) Received: from localhost ([::1]:34233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UamJO-0000kD-QF for incoming@patchwork.ozlabs.org; Fri, 10 May 2013 08:20:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UamG3-00049q-Vf for qemu-devel@nongnu.org; Fri, 10 May 2013 08:17:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UamG2-0007mf-Q5 for qemu-devel@nongnu.org; Fri, 10 May 2013 08:17:07 -0400 Received: from mail-wg0-x229.google.com ([2a00:1450:400c:c00::229]:46255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UamG2-0007mX-Kv for qemu-devel@nongnu.org; Fri, 10 May 2013 08:17:06 -0400 Received: by mail-wg0-f41.google.com with SMTP id y10so583492wgg.2 for ; Fri, 10 May 2013 05:17:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=jKaWonrT766sgxJnBswdJtToQiiKYpSENRBPTGBr4z4=; b=vecBIysLBHhw4qSbhR2fJYzHMTjcVVgc+oqTqQqpOAzYVffvvMjAFe8Kpl6ZMT0V0F WK2TZBt6yelx1xA1/6w3I5k8xRDNWmS6z+JIpHUe6bgWGHKJDyfxURGkLDy7ogMdNXBi tSBGVxwce+G5zga92OX4vufNw4Qhh+VE1cFWcpsOKhP2bpGPR0ybfoibuIXjobmjTIJE Gqjsru8oRUyPomEIrfJOwZucX8zu0ppfKuT2Ycv1GRVpQ7QOPcnqDxa7Y1CcIV0yXre7 rR692KikUTLkkTpb68quxN/aQr2NcVsXQjzzNvkRd2npkDdRjF/akw5Vw94iOQy8+luJ 1HBA== X-Received: by 10.194.133.130 with SMTP id pc2mr24310742wjb.35.1368188226017; Fri, 10 May 2013 05:17:06 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPSA id er17sm3529771wic.0.2013.05.10.05.17.04 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 05:17:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 10 May 2013 14:16:43 +0200 Message-Id: <1368188203-3407-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1368188203-3407-1-git-send-email-pbonzini@redhat.com> References: <1368188203-3407-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::229 Cc: Anthony Liguori , Andreas Faerber , Aurelien Jarno , mst@redhat.com Subject: [Qemu-devel] [PATCH for-1.5 9/9] qom: simplify object_class_dynamic_cast, part 2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Detect ambiguous matches right away, without going through all interfaces first. Signed-off-by: Paolo Bonzini --- 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,