From patchwork Sat Feb 4 08:02:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 139532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3B16C104799 for ; Sat, 4 Feb 2012 19:03:25 +1100 (EST) Received: from localhost ([::1]:37034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtaad-0001Id-5e for incoming@patchwork.ozlabs.org; Sat, 04 Feb 2012 03:03:19 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtaaQ-0001I6-7H for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtaaO-00058A-7w for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:05 -0500 Received: from mail-we0-f173.google.com ([74.125.82.173]:45017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtaaO-00057i-2e for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:04 -0500 Received: by werh12 with SMTP id h12so3839010wer.4 for ; Sat, 04 Feb 2012 00:03:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=Bv7clBUw2vYnanMbM9vzulmqDulJDD76y4bJppsBL08=; b=xYf5CUvB/bZ86MtKi0BMzTZl0FBxyYK47oCbozc2M3YVhmvMoFJmww8V8I7QrQm/M1 garmYusaXnu/LCFeznXKE70x2A1lo/s6KlSJAASf2qDop4RVelhSwSanB3rTrvf4oBia zeEqT+aghL9ASML0PygoDp/plpH5mbg2JIYbo= Received: by 10.216.133.71 with SMTP id p49mr631006wei.8.1328342583373; Sat, 04 Feb 2012 00:03:03 -0800 (PST) Received: from yakj.usersys.redhat.com.ACCOR.COM (218.104-246-81.adsl-static.isp.belgacom.be. [81.246.104.218]) by mx.google.com with ESMTPS id m8sm24963019wia.11.2012.02.04.00.03.02 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Feb 2012 00:03:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 4 Feb 2012 09:02:31 +0100 Message-Id: <1328342577-25732-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> References: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 Subject: [Qemu-devel] [PATCH v2 01/27] qom: clean up cast macros 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 Signed-off-by: Paolo Bonzini Reviewed-by: Anthony Liguori --- include/qemu/object.h | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/qemu/object.h b/include/qemu/object.h index 9d0251d..ab1c48c 100644 --- a/include/qemu/object.h +++ b/include/qemu/object.h @@ -259,6 +259,16 @@ struct TypeInfo ((Object *)(obj)) /** + * OBJECT_CLASS: + * @class: A derivative of #ObjectClas. + * + * Converts a class to an #ObjectClass. Since all objects are #Objects, + * this function will always succeed. + */ +#define OBJECT_CLASS(class) \ + ((ObjectClass *)(class)) + +/** * OBJECT_CHECK: * @type: The C type to use for the return value. * @obj: A derivative of @type to cast. @@ -272,7 +282,7 @@ struct TypeInfo * generated. */ #define OBJECT_CHECK(type, obj, name) \ - ((type *)object_dynamic_cast_assert((Object *)(obj), (name))) + ((type *)object_dynamic_cast_assert(OBJECT(obj), (name))) /** * OBJECT_CLASS_CHECK: @@ -280,11 +290,12 @@ struct TypeInfo * @obj: A derivative of @type to cast. * @name: the QOM typename of @class. * - * A type safe version of @object_check_class. This macro is typically wrapped - * by each type to perform type safe casts of a class to a specific class type. + * A type safe version of @object_class_dynamic_cast_assert. This macro is + * typically wrapped by each type to perform type safe casts of a class to a + * specific class type. */ #define OBJECT_CLASS_CHECK(class, obj, name) \ - ((class *)object_class_dynamic_cast_assert((ObjectClass *)(obj), (name))) + ((class *)object_class_dynamic_cast_assert(OBJECT_CLASS(obj), (name))) /** * OBJECT_GET_CLASS: @@ -299,9 +310,6 @@ struct TypeInfo #define OBJECT_GET_CLASS(class, obj, name) \ OBJECT_CLASS_CHECK(class, object_get_class(OBJECT(obj)), name) -#define OBJECT_CLASS(class) \ - ((ObjectClass *)(class)) - /** * InterfaceClass: * @parent_class: the base class