From nobody Sun Nov 16 07:20:09 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599087518; cv=none; d=zohomail.com; s=zohoarc; b=Ruq4F0xxn/QOKph/mg5w6fAUdAIN2OAr/wLBNxOR4fUekEu55eDRAImKCteQgfDvFIpdNAfhsP1AVol2Iy9KVFF7OQVnTJgRSItaVEFQFUdE7+Jd2mp392xDHLMEdO1yDOwgOVIAGoZjLpYcpv/Fz5MLrY9+UoXxHCPpsoGiDL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599087518; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZOGdFaTOCSQgkm1cUvnKEEVM+LkWfbdeSgjtcCPvnNE=; b=htURS1X3U9lX7sOm9tK/E2Zg6hjvC/o/xcuhr52WfyWL16/rH6PYm060wnJBBhyKS8oCUOqaDzZ3GJxkxeafiW+d45Q2X5CBc99QIAyo0mTX2JanXuG6RKipdtqXft9+NLXC0V4XeCYEM5mZwfDOI3lk1ec4F/50LzUjPNCWiuY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599087518072279.51218777242127; Wed, 2 Sep 2020 15:58:38 -0700 (PDT) Received: from localhost ([::1]:59056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbi9-0007r5-AQ for importer@patchew.org; Wed, 02 Sep 2020 18:58:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVD-0004bM-Bq for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:20772 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVB-00005o-AP for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:14 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-ZBCrlIXkPd2omv7hczqngw-1; Wed, 02 Sep 2020 18:45:10 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C64AD1074642; Wed, 2 Sep 2020 22:45:09 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 921E36198B; Wed, 2 Sep 2020 22:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZOGdFaTOCSQgkm1cUvnKEEVM+LkWfbdeSgjtcCPvnNE=; b=Ra4nDJGB/kJV+f+I5m1Vpj9XayVjeA0G/oVwUs/STS9fOM7q6yLm0QYkG4xnP4We7r4IUr Fd6ADZXBpRCYsr0HoKFwHWY7gVQkHb4JOoc5H2hp+taN+MXK8VnEUUw8FOEr3YMCVhRSc3 dyB7ZzLwZH4slpJsVxIznMpjKWDuv/c= X-MC-Unique: ZBCrlIXkPd2omv7hczqngw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 41/63] lance: Rename SYSBUS_PCNET to LANCE Date: Wed, 2 Sep 2020 18:42:49 -0400 Message-Id: <20200902224311.1321159-42-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:20:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , Jason Wang , berrange@redhat.com, Artyom Tarasenko Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Jason Wang Cc: Mark Cave-Ayland Cc: Artyom Tarasenko Cc: qemu-devel@nongnu.org --- include/hw/net/lance.h | 2 +- hw/net/lance.c | 6 +++--- hw/sparc/sun4m.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/hw/net/lance.h b/include/hw/net/lance.h index f645d6af67..a0434f1254 100644 --- a/include/hw/net/lance.h +++ b/include/hw/net/lance.h @@ -36,7 +36,7 @@ =20 #define TYPE_LANCE "lance" typedef struct SysBusPCNetState SysBusPCNetState; -DECLARE_INSTANCE_CHECKER(SysBusPCNetState, SYSBUS_PCNET, +DECLARE_INSTANCE_CHECKER(SysBusPCNetState, LANCE, TYPE_LANCE) =20 struct SysBusPCNetState { diff --git a/hw/net/lance.c b/hw/net/lance.c index 4c5f01baad..47ab7e1847 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -103,7 +103,7 @@ static const VMStateDescription vmstate_lance =3D { static void lance_realize(DeviceState *dev, Error **errp) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); - SysBusPCNetState *d =3D SYSBUS_PCNET(dev); + SysBusPCNetState *d =3D LANCE(dev); PCNetState *s =3D &d->state; =20 memory_region_init_io(&s->mmio, OBJECT(d), &lance_mem_ops, d, @@ -122,14 +122,14 @@ static void lance_realize(DeviceState *dev, Error **e= rrp) =20 static void lance_reset(DeviceState *dev) { - SysBusPCNetState *d =3D SYSBUS_PCNET(dev); + SysBusPCNetState *d =3D LANCE(dev); =20 pcnet_h_reset(&d->state); } =20 static void lance_instance_init(Object *obj) { - SysBusPCNetState *d =3D SYSBUS_PCNET(obj); + SysBusPCNetState *d =3D LANCE(obj); PCNetState *s =3D &d->state; =20 device_add_bootindex_property(obj, &s->conf.bootindex, diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 3ee7ef4590..192cb87658 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -353,7 +353,7 @@ static void *sparc32_dma_init(hwaddr dma_base, OBJECT(dma), "ledma")); sysbus_connect_irq(SYS_BUS_DEVICE(ledma), 0, ledma_irq); =20 - lance =3D SYSBUS_PCNET(object_resolve_path_component( + lance =3D LANCE(object_resolve_path_component( OBJECT(ledma), "lance")); sysbus_mmio_map(SYS_BUS_DEVICE(lance), 0, le_base); =20 --=20 2.26.2