From nobody Mon Feb 9 19:43:41 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 1501057067574151.70760883480534; Wed, 26 Jul 2017 01:17:47 -0700 (PDT) Received: from localhost ([::1]:36687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daHVq-0003V6-4d for importer@patchew.org; Wed, 26 Jul 2017 04:17:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daHSl-0001Qb-TU for qemu-devel@nongnu.org; Wed, 26 Jul 2017 04:14:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daHSk-0007Ic-Uc for qemu-devel@nongnu.org; Wed, 26 Jul 2017 04:14:35 -0400 Received: from [59.151.112.132] (port=27895 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daHSk-0007Ht-Hy for qemu-devel@nongnu.org; Wed, 26 Jul 2017 04:14:34 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Jul 2017 16:14:31 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 2DEF240056E9; Wed, 26 Jul 2017 16:14:26 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 26 Jul 2017 16:14:25 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="21833396" From: Mao Zhongyi To: Date: Wed, 26 Jul 2017 16:13:35 +0800 Message-ID: <6d339059d168f3a9d89f89e2125db1131b4f3023.1501052660.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.4 MIME-Version: 1.0 In-Reply-To: References: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 2DEF240056E9.AB545 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v6 4/4] 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: jasowang@redhat.com, jiri@resnulli.us, armbru@redhat.com, f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 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 --- 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.9.4