From nobody Wed Nov 5 20:16:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536757171557331.7622345838165; Wed, 12 Sep 2018 05:59:31 -0700 (PDT) Received: from localhost ([::1]:36143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g04ju-0001SA-1x for importer@patchew.org; Wed, 12 Sep 2018 08:59:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g04gO-0007DW-Gm for qemu-devel@nongnu.org; Wed, 12 Sep 2018 08:55:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g04gN-0007gV-ME for qemu-devel@nongnu.org; Wed, 12 Sep 2018 08:55:48 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55000 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g04gN-0007g8-FN for qemu-devel@nongnu.org; Wed, 12 Sep 2018 08:55:47 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02D148011059; Wed, 12 Sep 2018 12:55:47 +0000 (UTC) Received: from localhost (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 388152166BA3; Wed, 12 Sep 2018 12:55:41 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Wed, 12 Sep 2018 16:55:23 +0400 Message-Id: <20180912125531.32131-2-marcandre.lureau@redhat.com> In-Reply-To: <20180912125531.32131-1-marcandre.lureau@redhat.com> References: <20180912125531.32131-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 12 Sep 2018 12:55:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 12 Sep 2018 12:55:47 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'marcandre.lureau@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/9] qom/user-creatable: add a few helper macros X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Mark Cave-Ayland , dgilbert@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Improve a bit code readability. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/qom/object_interfaces.h | 4 ++++ qom/object.c | 4 ++-- qom/object_interfaces.c | 9 +++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/qom/object_interfaces.h b/include/qom/object_interface= s.h index 4d513fb329..46b0861457 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -9,9 +9,13 @@ #define USER_CREATABLE_CLASS(klass) \ OBJECT_CLASS_CHECK(UserCreatableClass, (klass), \ TYPE_USER_CREATABLE) +#define IS_USER_CREATABLE_CLASS(klass) \ + object_class_dynamic_cast(OBJECT_CLASS(oc), TYPE_USER_CREATABLE) #define USER_CREATABLE_GET_CLASS(obj) \ OBJECT_GET_CLASS(UserCreatableClass, (obj), \ TYPE_USER_CREATABLE) +#define IS_USER_CREATABLE(obj) \ + object_dynamic_cast(OBJECT(obj), TYPE_USER_CREATABLE) #define USER_CREATABLE(obj) \ INTERFACE_CHECK(UserCreatable, (obj), \ TYPE_USER_CREATABLE) diff --git a/qom/object.c b/qom/object.c index 75d1d48944..0703e8e4ff 100644 --- a/qom/object.c +++ b/qom/object.c @@ -424,7 +424,7 @@ void object_initialize_childv(Object *parentobj, const = char *propname, goto out; } =20 - if (object_dynamic_cast(obj, TYPE_USER_CREATABLE)) { + if (IS_USER_CREATABLE(obj)) { user_creatable_complete(obj, &local_err); if (local_err) { object_unparent(obj); @@ -605,7 +605,7 @@ Object *object_new_with_propv(const char *typename, goto error; } =20 - if (object_dynamic_cast(obj, TYPE_USER_CREATABLE)) { + if (IS_USER_CREATABLE(obj)) { user_creatable_complete(obj, &local_err); if (local_err) { object_unparent(obj); diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 72b97a8bed..e3084bc04a 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -10,18 +10,15 @@ =20 void user_creatable_complete(Object *obj, Error **errp) { - UserCreatableClass *ucc; - UserCreatable *uc =3D - (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE); =20 - if (!uc) { + if (!IS_USER_CREATABLE(obj)) { return; } =20 - ucc =3D USER_CREATABLE_GET_CLASS(uc); + ucc =3D USER_CREATABLE_GET_CLASS(obj); if (ucc->complete) { - ucc->complete(uc, errp); + ucc->complete(USER_CREATABLE(obj), errp); } } =20 --=20 2.19.0.rc1