From nobody Tue Feb 10 22:18:13 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; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506097269214321.6969565290883; Fri, 22 Sep 2017 09:21:09 -0700 (PDT) Received: from localhost ([::1]:59944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvQhL-0006FR-2X for importer@patchew.org; Fri, 22 Sep 2017 12:21:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvQOk-0006B4-NU for qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:01:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvQOj-0008Rl-EC for qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:01:50 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33378) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvQOj-0008RT-9j; Fri, 22 Sep 2017 12:01:49 -0400 Received: by mail-qt0-x243.google.com with SMTP id b1so930196qtc.0; Fri, 22 Sep 2017 09:01:49 -0700 (PDT) Received: from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id y31sm108325qta.83.2017.09.22.09.01.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Sep 2017 09:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6DjZmog4n/45jCIOJkqhryd4UV1+K90QdQo1G7wRsjE=; b=pK2TwUOq+baZMPBiOv+zBkfHmpVMO9lVgEz+zai6DzHbhUREP8ujSVO+78wA9xck6u LeeJsshlW2b4q70Y/KG7EPB/SJLCyKOK6pJEmY4z7DpV0NLmKbUXHBtLH2iZ4v48RiBV TQ64m8RqUA8OuzRcURuBJ1w+wVhFEqC2dmCWntpQUQAeFseMG83fu9uQKrWEx5awAQu+ 9dtZSIOlpyfcC/yUlDTeupaiffdh4BGIScTjP+VAXIi1QB+tpm4ZmGQ2mUwA/euPHBJe H7b8QorADhVhKUakDLsCNknepA+Jw81co7wgXV6tVp0N8P2Xd05pBg86GZtjog/IMFTW Ni+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6DjZmog4n/45jCIOJkqhryd4UV1+K90QdQo1G7wRsjE=; b=a9bc4cItUqtfgOx4FuZdnpe42yQooUVRgCbXezFW/CRLwo9DYjgzS+22WdNxaR/eU9 7rPvNN8O17dTLP1zsxh7KJSMu3ngkwswT0TkOVA61QymVj5+cKLpILyi9Jj3qEooZudx dCbQ9v3HI0Iw3OkvMww/PrZkHtjyS35v4UmbITfgvo63q4/jr1i867HQbdy2qGFMLSR3 D8+kcml3P5+jpjd6z4f041Yrz8X3CQRBlV2Tvd2Fx8mazevglVbkkYPzqEzn9Jpwh8dY ajb4jR9UWEKvlQrwVGZ8Bs25/m9cHPGNm+Xp9iSuvti/oHmCL5yN00MEoAlVyp7Ob3um UWoA== X-Gm-Message-State: AHPjjUiOmRuU2DCCYB8kV4gXPy6aS+P/9+DBnttyfub7SeaJxb4BlNFw IFkESk6XVrKupg7/buwp9uecCSKVefU= X-Google-Smtp-Source: AOwi7QArqF6q+C6QbAGqMcdqBsKT/plSOohx9Ppvt2EtZ2ijzZv1pLFwdwKOyKqO73p2iu8QTPovwg== X-Received: by 10.200.26.65 with SMTP id q1mr8502737qtk.186.1506096108670; Fri, 22 Sep 2017 09:01:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , David Gibson , Alexander Graf , Jason Wang Date: Fri, 22 Sep 2017 13:01:03 -0300 Message-Id: <20170922160111.31885-4-f4bug@amsat.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922154014.29350-1-f4bug@amsat.org> References: <20170922154014.29350-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 26/34] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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 - add "hw/net/ne2000-isa.h" (and new entry in MAINTAINERS) - remove the old i386 dependency Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Reviewed-by: Herv=C3=A9 Poussineau --- hw/net/ne2000.h | 3 +++ include/hw/i386/pc.h | 20 -------------------- include/hw/net/ne2000-isa.h | 33 +++++++++++++++++++++++++++++++++ hw/i386/pc.c | 1 + hw/mips/mips_r4k.c | 1 + hw/net/ne2000-isa.c | 6 ++---- hw/net/ne2000.c | 2 -- hw/ppc/prep.c | 1 + MAINTAINERS | 1 + 9 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 include/hw/net/ne2000-isa.h diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h index d213dccae3..adb8021bd1 100644 --- a/hw/net/ne2000.h +++ b/hw/net/ne2000.h @@ -1,6 +1,9 @@ #ifndef HW_NE2000_H #define HW_NE2000_H =20 +#include "hw/hw.h" +#include "net/net.h" + #define NE2000_PMEM_SIZE (32*1024) #define NE2000_PMEM_START (16*1024) #define NE2000_PMEM_END (NE2000_PMEM_SIZE+NE2000_PMEM_START) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 6a2e947332..020792c2e8 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -291,26 +291,6 @@ PCIBus *find_i440fx(void); extern PCIDevice *piix4_dev; int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn); =20 -/* ne2000.c */ -static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo= *nd) -{ - DeviceState *dev; - ISADevice *isadev; - - qemu_check_nic_model(nd, "ne2k_isa"); - - isadev =3D isa_try_create(bus, "ne2k_isa"); - if (!isadev) { - return false; - } - dev =3D DEVICE(isadev); - qdev_prop_set_uint32(dev, "iobase", base); - qdev_prop_set_uint32(dev, "irq", irq); - qdev_set_nic_properties(dev, nd); - qdev_init_nofail(dev); - return true; -} - /* pc_sysfw.c */ void pc_system_firmware_init(MemoryRegion *rom_memory, bool isapc_ram_fw); diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h new file mode 100644 index 0000000000..ff2bed9c95 --- /dev/null +++ b/include/hw/net/ne2000-isa.h @@ -0,0 +1,33 @@ +/* + * QEMU NE2000 emulation -- isa bus windup + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#include "hw/hw.h" +#include "hw/qdev.h" +#include "hw/isa/isa.h" +#include "net/net.h" + +#define TYPE_ISA_NE2000 "ne2k_isa" + +static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq, + NICInfo *nd) +{ + ISADevice *d; + + qemu_check_nic_model(nd, "ne2k_isa"); + + d =3D isa_try_create(bus, TYPE_ISA_NE2000); + if (d) { + DeviceState *dev =3D DEVICE(d); + + qdev_prop_set_uint32(dev, "iobase", base); + qdev_prop_set_uint32(dev, "irq", irq); + qdev_set_nic_properties(dev, nd); + qdev_init_nofail(dev); + } + return d; +} diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 788844e0de..085577e066 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -71,6 +71,7 @@ #include "qom/cpu.h" #include "hw/nmi.h" #include "hw/i386/intel_iommu.h" +#include "hw/net/ne2000-isa.h" =20 /* debug PC/ISA interrupts */ //#define DEBUG_IRQ diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 349da59912..33ff89f02c 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -18,6 +18,7 @@ #include "hw/char/serial.h" #include "hw/isa/isa.h" #include "net/net.h" +#include "hw/net/ne2000-isa.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/block/flash.h" diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index f3455339ee..70e5c1d3d4 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -22,17 +22,15 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" +#include "hw/net/ne2000-isa.h" #include "hw/qdev.h" -#include "net/net.h" #include "ne2000.h" +#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "qapi/error.h" #include "qapi/visitor.h" =20 -#define TYPE_ISA_NE2000 "ne2k_isa" #define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE200= 0) =20 typedef struct ISANE2000State { diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 798d681e25..29bd4adb3f 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -22,9 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" -#include "net/net.h" #include "ne2000.h" #include "hw/loader.h" #include "sysemu/sysemu.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 1f8ef4819b..fb330a1769 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -43,6 +43,7 @@ #include "hw/timer/mc146818rtc.h" #include "hw/input/i8042.h" #include "hw/isa/pc87312.h" +#include "hw/net/ne2000-isa.h" #include "sysemu/block-backend.h" #include "sysemu/arch_init.h" #include "sysemu/kvm.h" diff --git a/MAINTAINERS b/MAINTAINERS index 3cb6bc190c..37917af0f0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -973,6 +973,7 @@ Network devices M: Jason Wang S: Odd Fixes F: hw/net/ +F: include/hw/net/ F: tests/virtio-net-test.c T: git git://github.com/jasowang/qemu.git net =20 --=20 2.14.1