From nobody Sat Feb 7 07:18:24 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502681897608251.29882320465674; Sun, 13 Aug 2017 20:38:17 -0700 (PDT) Received: from localhost ([::1]:40924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dh6Cm-0000Iy-NS for importer@patchew.org; Sun, 13 Aug 2017 23:38:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dh68E-0004zg-0m for qemu-devel@nongnu.org; Sun, 13 Aug 2017 23:33:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dh68C-0007s4-VU for qemu-devel@nongnu.org; Sun, 13 Aug 2017 23:33:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38430) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dh68C-0007ry-Lz for qemu-devel@nongnu.org; Sun, 13 Aug 2017 23:33:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A10693E2B6; Mon, 14 Aug 2017 03:33:31 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-53.pek2.redhat.com [10.72.12.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id B45E466FE2; Mon, 14 Aug 2017 03:33:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A10693E2B6 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jasowang@redhat.com From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 14 Aug 2017 11:33:10 +0800 Message-Id: <1502681591-31362-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1502681591-31362-1-git-send-email-jasowang@redhat.com> References: <1502681591-31362-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 14 Aug 2017 03:33:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PULL 4/5] net/rocker: Fix the unusual macro name 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: Mao Zhongyi , f4bug@amsat.org, jiri@resnulli.us, jasowang@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Mao Zhongyi Cc: jasowang@redhat.com Cc: jiri@resnulli.us Cc: armbru@redhat.com Cc: f4bug@amsat.org Suggested-by: Markus Armbruster Signed-off-by: Mao Zhongyi Reviewed-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Jason Wang --- hw/net/rocker/rocker.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index bb38cba..9273473 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -69,10 +69,10 @@ struct rocker { QLIST_ENTRY(rocker) next; }; =20 -#define ROCKER "rocker" +#define TYPE_ROCKER "rocker" =20 -#define to_rocker(obj) \ - OBJECT_CHECK(Rocker, (obj), ROCKER) +#define ROCKER(obj) \ + OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER) =20 static QLIST_HEAD(, rocker) rockers; =20 @@ -1285,7 +1285,7 @@ static World *rocker_world_type_by_name(Rocker *r, co= nst char *name) =20 static void pci_rocker_realize(PCIDevice *dev, Error **errp) { - Rocker *r =3D to_rocker(dev); + Rocker *r =3D ROCKER(dev); const MACAddr zero =3D { .a =3D { 0, 0, 0, 0, 0, 0 } }; const MACAddr dflt =3D { .a =3D { 0x52, 0x54, 0x00, 0x12, 0x35, 0x01 }= }; static int sw_index; @@ -1331,7 +1331,7 @@ static void pci_rocker_realize(PCIDevice *dev, Error = **errp) /* validate switch properties */ =20 if (!r->name) { - r->name =3D g_strdup(ROCKER); + r->name =3D g_strdup(TYPE_ROCKER); } =20 if (rocker_find(r->name)) { @@ -1427,7 +1427,7 @@ err_world_type_by_name: =20 static void pci_rocker_uninit(PCIDevice *dev) { - Rocker *r =3D to_rocker(dev); + Rocker *r =3D ROCKER(dev); int i; =20 QLIST_REMOVE(r, next); @@ -1460,7 +1460,7 @@ static void pci_rocker_uninit(PCIDevice *dev) =20 static void rocker_reset(DeviceState *dev) { - Rocker *r =3D to_rocker(dev); + Rocker *r =3D ROCKER(dev); int i; =20 for (i =3D 0; i < ROCKER_WORLD_TYPE_MAX; i++) { @@ -1498,7 +1498,7 @@ static Property rocker_properties[] =3D { }; =20 static const VMStateDescription rocker_vmsd =3D { - .name =3D ROCKER, + .name =3D TYPE_ROCKER, .unmigratable =3D 1, }; =20 @@ -1521,7 +1521,7 @@ static void rocker_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo rocker_info =3D { - .name =3D ROCKER, + .name =3D TYPE_ROCKER, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(Rocker), .class_init =3D rocker_class_init, --=20 2.7.4