From nobody Thu Nov 6 03:26:09 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; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539412407528284.90248198085203; Fri, 12 Oct 2018 23:33:27 -0700 (PDT) Received: from localhost ([::1]:43907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBDU6-00016I-K9 for importer@patchew.org; Sat, 13 Oct 2018 02:33:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBDTB-0000dw-HG for qemu-devel@nongnu.org; Sat, 13 Oct 2018 02:32:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBDT4-0002zs-2z for qemu-devel@nongnu.org; Sat, 13 Oct 2018 02:32:13 -0400 Received: from m12-16.163.com ([220.181.12.16]:57228) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBDT2-0002xP-5v for qemu-devel@nongnu.org; Sat, 13 Oct 2018 02:32:05 -0400 Received: from ubuntu.localdomain (unknown [115.192.95.72]) by smtp12 (Coremail) with SMTP id EMCowAB3VTlakcFboOFwJA--.246S2; Sat, 13 Oct 2018 14:31:55 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=NwGEmoajT4RXkVCPuB HhInqxQp5VeHZddlC/nH7SFLg=; b=ovXN5Kr2QUujuxyw1+IXk5SGjc/ttW7NqR cICcPDpfCqljOjXUbuqqRvbDeZUgcjfdbAGG8nIDquWPJVXQKDQ2nUPJGb0Tai0c 1CWPZGeEGMqaAF69IVYuchyrVL/xAyvMMPRUsNYarW4pYSFz7AdbA1b5kXa7Xu/5 hWB634tSg= From: Li Qiang To: jasowang@redhat.com Date: Fri, 12 Oct 2018 23:31:53 -0700 Message-Id: <20181013063153.54423-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: EMCowAB3VTlakcFboOFwJA--.246S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cw18Jr15Zw1Uuw4ktryDAwb_yoW8ZF1xpa s0qF47tr48Jr47JanxtF9rXF1kXanxWayY9ryUCw1Sga4kZFy5tr4DCa1rJr1DW395uF4Y yFs0g347uw47JaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zR2XdbUUUUU= X-Originating-IP: [115.192.95.72] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBLxvebVUMGW3BFAAAs- X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.16 Subject: [Qemu-devel] [PATCH] hw: ne2000: make it more QOMconventional 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: Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Li Qiang --- hw/net/ne2000.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 07d79e317f..ab71ad49cb 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -33,6 +33,10 @@ =20 #define MAX_ETH_FRAME_SIZE 1514 =20 +#define TYPE_NE2000 "ne2k_pci" +#define NE2000(obj) \ + OBJECT_CHECK(PCINE2000State, (obj), TYPE_NE2000) + #define E8390_CMD 0x00 /* The command register (for all pages) */ /* Page 0 register offsets. */ #define EN0_CLDALO 0x01 /* Low byte of current local dma addr RD */ @@ -720,7 +724,7 @@ static NetClientInfo net_ne2000_info =3D { =20 static void pci_ne2000_realize(PCIDevice *pci_dev, Error **errp) { - PCINE2000State *d =3D DO_UPCAST(PCINE2000State, dev, pci_dev); + PCINE2000State *d =3D NE2000(pci_dev); NE2000State *s; uint8_t *pci_conf; =20 @@ -742,7 +746,7 @@ static void pci_ne2000_realize(PCIDevice *pci_dev, Erro= r **errp) =20 static void pci_ne2000_exit(PCIDevice *pci_dev) { - PCINE2000State *d =3D DO_UPCAST(PCINE2000State, dev, pci_dev); + PCINE2000State *d =3D NE2000(pci_dev); NE2000State *s =3D &d->ne2000; =20 qemu_del_nic(s->nic); @@ -751,13 +755,12 @@ static void pci_ne2000_exit(PCIDevice *pci_dev) =20 static void ne2000_instance_init(Object *obj) { - PCIDevice *pci_dev =3D PCI_DEVICE(obj); - PCINE2000State *d =3D DO_UPCAST(PCINE2000State, dev, pci_dev); + PCINE2000State *d =3D NE2000(obj); NE2000State *s =3D &d->ne2000; =20 device_add_bootindex_property(obj, &s->c.bootindex, "bootindex", "/ethernet-phy@0", - &pci_dev->qdev, NULL); + DEVICE(obj), NULL); } =20 static Property ne2000_properties[] =3D { @@ -782,7 +785,7 @@ static void ne2000_class_init(ObjectClass *klass, void = *data) } =20 static const TypeInfo ne2000_info =3D { - .name =3D "ne2k_pci", + .name =3D TYPE_NE2000, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCINE2000State), .class_init =3D ne2000_class_init, --=20 2.17.1