From nobody Wed Feb 11 07:26:23 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1508005185063788.6339030715851; Sat, 14 Oct 2017 11:19:45 -0700 (PDT) Received: from localhost ([::1]:54825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3R28-0008HF-4H for importer@patchew.org; Sat, 14 Oct 2017 14:19:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3QsO-0001WE-OI for qemu-devel@nongnu.org; Sat, 14 Oct 2017 14:09:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3QsL-00032D-KN for qemu-devel@nongnu.org; Sat, 14 Oct 2017 14:09:32 -0400 Received: from chuckie.co.uk ([82.165.15.123]:36831 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e3QsL-00031z-D8 for qemu-devel@nongnu.org; Sat, 14 Oct 2017 14:09:29 -0400 Received: from host86-191-119-84.range86-191.btcentralplus.com ([86.191.119.84] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1e3QsP-0002Gl-Ok; Sat, 14 Oct 2017 19:09:34 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, atar4qemu@gmail.com Date: Sat, 14 Oct 2017 19:09:01 +0100 Message-Id: <1508004545-28578-10-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1508004545-28578-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1508004545-28578-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 86.191.119.84 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCHv2 09/13] lance: move TYPE_LANCE and SysBusPCNetState from lance.c to sun4m.h 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This enables them to be used outside of lance.c. Signed-off-by: Mark Cave-Ayland CC: Jason Wang --- hw/net/lance.c | 9 --------- include/hw/sparc/sun4m.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/hw/net/lance.c b/hw/net/lance.c index 92b0c68..ef7747d 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -45,15 +45,6 @@ #include "trace.h" #include "sysemu/sysemu.h" =20 -#define TYPE_LANCE "lance" -#define SYSBUS_PCNET(obj) \ - OBJECT_CHECK(SysBusPCNetState, (obj), TYPE_LANCE) - -typedef struct { - SysBusDevice parent_obj; - - PCNetState state; -} SysBusPCNetState; =20 static void parent_lance_reset(void *opaque, int irq, int level) { diff --git a/include/hw/sparc/sun4m.h b/include/hw/sparc/sun4m.h index 1f1cf91..a4f5f09 100644 --- a/include/hw/sparc/sun4m.h +++ b/include/hw/sparc/sun4m.h @@ -5,6 +5,8 @@ #include "exec/hwaddr.h" #include "qapi/qmp/types.h" #include "hw/sysbus.h" +#include "net/net.h" +#include "hw/net/pcnet.h" =20 /* Devices used by sparc32 system. */ =20 @@ -40,6 +42,17 @@ static inline void sparc_iommu_memory_write(void *opaque, sparc_iommu_memory_rw(opaque, addr, buf, len, 1); } =20 +/* lance.c */ +#define TYPE_LANCE "lance" +#define SYSBUS_PCNET(obj) \ + OBJECT_CHECK(SysBusPCNetState, (obj), TYPE_LANCE) + +typedef struct { + SysBusDevice parent_obj; + + PCNetState state; +} SysBusPCNetState; + /* sparc32_dma.c */ #include "hw/sparc/sparc32_dma.h" =20 --=20 1.7.10.4