From nobody Mon Apr 29 11:27:06 2024 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490988661572515.7266685321143; Fri, 31 Mar 2017 12:31:01 -0700 (PDT) Received: from localhost ([::1]:42614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cu2GC-0000zF-7g for importer@patchew.org; Fri, 31 Mar 2017 15:31:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cu2Ct-0006sq-K5 for qemu-devel@nongnu.org; Fri, 31 Mar 2017 15:27:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cu2Cr-0004JL-61 for qemu-devel@nongnu.org; Fri, 31 Mar 2017 15:27:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49344) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cu2Cq-0004J2-TN; Fri, 31 Mar 2017 15:27:33 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D04C475EA8; Fri, 31 Mar 2017 19:27:31 +0000 (UTC) Received: from localhost (ovpn-116-5.gru2.redhat.com [10.97.116.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A87A7EBC8; Fri, 31 Mar 2017 19:27:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D04C475EA8 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D04C475EA8 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 16:27:23 -0300 Message-Id: <20170331192724.14339-2-ehabkost@redhat.com> In-Reply-To: <20170331192724.14339-1-ehabkost@redhat.com> References: <20170331192724.14339-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 31 Mar 2017 19:27:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.10 1/2] etsec: Rename (TYPE_)ETSEC_COMMON to (TYPE_)ETSEC 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: Scott Wood , Jason Wang , qemu-ppc@nongnu.org, Alexander Graf , Fabien Chouteau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Types named *_COMMON are normally used when there's a common parent class for multiple classes. We have only one eTSEC type, so rename the TYPE_ETSEC_COMMON and ETSEC_COMMON macros to TYPE_ETSEC and TYPE_ETSEC_COMMON. Signed-off-by: Eduardo Habkost Reviewed-by: Fabien Chouteau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/fsl_etsec/etsec.h | 6 +++--- hw/net/fsl_etsec/etsec.c | 6 +++--- hw/ppc/e500.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h index 30c828e241..3da412e733 100644 --- a/hw/net/fsl_etsec/etsec.h +++ b/hw/net/fsl_etsec/etsec.h @@ -149,9 +149,9 @@ typedef struct eTSEC { bool need_flush; } eTSEC; =20 -#define TYPE_ETSEC_COMMON "eTSEC" -#define ETSEC_COMMON(obj) \ - OBJECT_CHECK(eTSEC, (obj), TYPE_ETSEC_COMMON) +#define TYPE_ETSEC "eTSEC" +#define ETSEC(obj) \ + OBJECT_CHECK(eTSEC, (obj), TYPE_ETSEC) =20 #define eTSEC_TRANSMIT 1 #define eTSEC_RECEIVE 2 diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index aa2b0d5a85..ddefaf560c 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -303,7 +303,7 @@ static void etsec_timer_hit(void *opaque) =20 static void etsec_reset(DeviceState *d) { - eTSEC *etsec =3D ETSEC_COMMON(d); + eTSEC *etsec =3D ETSEC(d); int i =3D 0; int reg_index =3D 0; =20 @@ -378,7 +378,7 @@ static NetClientInfo net_etsec_info =3D { =20 static void etsec_realize(DeviceState *dev, Error **errp) { - eTSEC *etsec =3D ETSEC_COMMON(dev); + eTSEC *etsec =3D ETSEC(dev); =20 etsec->nic =3D qemu_new_nic(&net_etsec_info, &etsec->conf, object_get_typename(OBJECT(dev)), dev->id, e= tsec); @@ -392,7 +392,7 @@ static void etsec_realize(DeviceState *dev, Error **err= p) =20 static void etsec_instance_init(Object *obj) { - eTSEC *etsec =3D ETSEC_COMMON(obj); + eTSEC *etsec =3D ETSEC(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 memory_region_init_io(&etsec->io_area, OBJECT(etsec), &etsec_ops, etse= c, diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index f7df2388c1..f6478b3a68 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -161,7 +161,7 @@ typedef struct PlatformDevtreeData { =20 static int create_devtree_etsec(SysBusDevice *sbdev, PlatformDevtreeData *= data) { - eTSEC *etsec =3D ETSEC_COMMON(sbdev); + eTSEC *etsec =3D ETSEC(sbdev); PlatformBusDevice *pbus =3D data->pbus; hwaddr mmio0 =3D platform_bus_get_mmio_addr(pbus, sbdev, 0); int irq0 =3D platform_bus_get_irqn(pbus, sbdev, 0); @@ -201,7 +201,7 @@ static void sysbus_device_create_devtree(SysBusDevice *= sbdev, void *opaque) PlatformDevtreeData *data =3D opaque; bool matched =3D false; =20 - if (object_dynamic_cast(OBJECT(sbdev), TYPE_ETSEC_COMMON)) { + if (object_dynamic_cast(OBJECT(sbdev), TYPE_ETSEC)) { create_devtree_etsec(sbdev, data); matched =3D true; } --=20 2.11.0.259.g40922b1 From nobody Mon Apr 29 11:27:06 2024 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490988560825103.45806285276751; Fri, 31 Mar 2017 12:29:20 -0700 (PDT) Received: from localhost ([::1]:42601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cu2EZ-00081p-IQ for importer@patchew.org; Fri, 31 Mar 2017 15:29:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cu2Ct-0006sr-K7 for qemu-devel@nongnu.org; Fri, 31 Mar 2017 15:27:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cu2Cs-0004KO-Sf for qemu-devel@nongnu.org; Fri, 31 Mar 2017 15:27:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45966) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cu2Cs-0004K3-Mh; Fri, 31 Mar 2017 15:27:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA34683F47; Fri, 31 Mar 2017 19:27:33 +0000 (UTC) Received: from localhost (ovpn-116-5.gru2.redhat.com [10.97.116.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AFC75C54F; Fri, 31 Mar 2017 19:27:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BA34683F47 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BA34683F47 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 16:27:24 -0300 Message-Id: <20170331192724.14339-3-ehabkost@redhat.com> In-Reply-To: <20170331192724.14339-1-ehabkost@redhat.com> References: <20170331192724.14339-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 31 Mar 2017 19:27:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.10 2/2] etsec: Use TYPE_ETSEC macro when registering/creating device 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: Scott Wood , Jason Wang , qemu-ppc@nongnu.org, Alexander Graf , Fabien Chouteau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of hardcoding the class name, use the TYPE_ETSEC macro when registering the class and creating devices. Signed-off-by: Eduardo Habkost Reviewed-by: Fabien Chouteau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/fsl_etsec/etsec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index ddefaf560c..5d2c45de6f 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -419,7 +419,7 @@ static void etsec_class_init(ObjectClass *klass, void *= data) } =20 static TypeInfo etsec_info =3D { - .name =3D "eTSEC", + .name =3D TYPE_ETSEC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(eTSEC), .class_init =3D etsec_class_init, @@ -442,7 +442,7 @@ DeviceState *etsec_create(hwaddr base, { DeviceState *dev; =20 - dev =3D qdev_create(NULL, "eTSEC"); + dev =3D qdev_create(NULL, TYPE_ETSEC); qdev_set_nic_properties(dev, nd); qdev_init_nofail(dev); =20 --=20 2.11.0.259.g40922b1