From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Thomas Huth <thuth@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Magnus Damm" <magnus.damm@gmail.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Andrew Jeffery" <andrew@aj.id.au>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Joel Stanley" <joel@jms.id.au>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Andrzej Zaborowski" <balrogg@gmail.com>,
"Igor Mitsyanko" <i.mitsyanko@gmail.com>,
"Beniamino Galvani" <b.galvani@gmail.com>,
"Michael Walle" <michael@walle.cc>,
"Richard Henderson" <rth@twiddle.net>,
"Jan Kiszka" <jan.kiszka@web.de>,
"Jason Wang" <jasowang@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Peter Chubb" <peter.chubb@nicta.com.au>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Cédric Le Goater" <clg@kaod.org>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Rob Herring" <robh@kernel.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH 15/16] hw/devices: Move SMSC 91C111 declaration into a new header
Date: Fri, 4 Jan 2019 18:58:46 +0100 [thread overview]
Message-ID: <20190104175847.6290-16-philmd@redhat.com> (raw)
In-Reply-To: <20190104175847.6290-1-philmd@redhat.com>
This commit finally deletes "hw/devices.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/arm/gumstix.c | 2 +-
hw/arm/integratorcp.c | 2 +-
hw/arm/mainstone.c | 2 +-
hw/arm/realview.c | 2 +-
hw/arm/versatilepb.c | 2 +-
hw/net/smc91c111.c | 2 +-
include/hw/devices.h | 11 -----------
include/hw/net/smc91c111.h | 18 ++++++++++++++++++
8 files changed, 24 insertions(+), 17 deletions(-)
delete mode 100644 include/hw/devices.h
create mode 100644 include/hw/net/smc91c111.h
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 56cb763c4e..98c3e6d41c 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -40,7 +40,7 @@
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/block/flash.h"
-#include "hw/devices.h"
+#include "hw/net/smc91c111.h"
#include "hw/boards.h"
#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 4eceebb9ea..0b6f24465e 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -12,10 +12,10 @@
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/arm/arm.h"
#include "hw/misc/arm_integrator_debug.h"
+#include "hw/net/smc91c111.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index 0beb5c426b..fbe8d5cbd4 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -18,7 +18,7 @@
#include "hw/arm/pxa.h"
#include "hw/arm/arm.h"
#include "net/net.h"
-#include "hw/devices.h"
+#include "hw/net/smc91c111.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "hw/sysbus.h"
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index e9983c8763..05a244df25 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -14,8 +14,8 @@
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
-#include "hw/devices.h"
#include "hw/net/lan9118.h"
+#include "hw/net/smc91c111.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 22b09a1e61..70b5fda737 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -13,7 +13,7 @@
#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
-#include "hw/devices.h"
+#include "hw/net/smc91c111.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index 99da2d9297..d19ea0750d 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/devices.h"
+#include "hw/net/smc91c111.h"
#include "qemu/log.h"
/* For crc32 */
#include <zlib.h>
diff --git a/include/hw/devices.h b/include/hw/devices.h
deleted file mode 100644
index ebc45c8799..0000000000
--- a/include/hw/devices.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef QEMU_DEVICES_H
-#define QEMU_DEVICES_H
-
-/* Devices that have nowhere better to go. */
-
-#include "hw/hw.h"
-
-/* smc91c111.c */
-void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
-
-#endif
diff --git a/include/hw/net/smc91c111.h b/include/hw/net/smc91c111.h
new file mode 100644
index 0000000000..46f7d9a5d4
--- /dev/null
+++ b/include/hw/net/smc91c111.h
@@ -0,0 +1,18 @@
+/*
+ * SMSC 91C111 Ethernet interface emulation
+ *
+ * Copyright (c) 2005 CodeSourcery, LLC.
+ * Written by Paul Brook
+ *
+ * This code is licensed under the GPL
+ */
+
+#ifndef HW_NET_SMC91C111_H
+#define HW_NET_SMC91C111_H
+
+#include "hw/irq.h"
+#include "net/net.h"
+
+void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
+
+#endif
--
2.17.2
next prev parent reply other threads:[~2019-01-04 18:02 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string Philippe Mathieu-Daudé
2019-01-04 19:40 ` Thomas Huth
2019-01-07 6:48 ` Cédric Le Goater
2019-01-04 17:58 ` [Qemu-devel] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include Philippe Mathieu-Daudé
2019-01-04 22:24 ` [Qemu-devel] [Qemu-ppc] " BALATON Zoltan
2019-01-07 9:56 ` [Qemu-devel] " Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 03/16] hw/devices: Remove unused TC6393XB_RAM definition Philippe Mathieu-Daudé
2019-01-07 6:32 ` Thomas Huth
2019-01-07 7:56 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 04/16] hw/devices: Move TC6393XB declarations into a new header Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard " Philippe Mathieu-Daudé
2019-01-07 6:39 ` Thomas Huth
2019-01-07 7:58 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 06/16] hw/devices: Move CBus " Philippe Mathieu-Daudé
2019-01-07 7:00 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 07/16] hw/devices: Move Gamepad " Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices Philippe Mathieu-Daudé
2019-01-07 7:18 ` Thomas Huth
2019-01-07 8:02 ` Philippe Mathieu-Daudé
2019-01-07 8:05 ` Thomas Huth
2019-01-07 11:44 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 09/16] hw/devices: Move TI touchscreen declarations into a new header Philippe Mathieu-Daudé
2019-01-07 7:22 ` Thomas Huth
2019-01-07 8:02 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 10/16] typedefs: Remove MouseTransformInfo Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 11/16] typedefs: Remove PS2State Philippe Mathieu-Daudé
2019-01-07 7:26 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 12/16] hw/devices: Move LAN9118 declarations into a new header Philippe Mathieu-Daudé
2019-01-07 7:29 ` Thomas Huth
2019-01-07 8:04 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 13/16] hw/net/ne2000-isa: Add guards to the header Philippe Mathieu-Daudé
2019-01-07 7:34 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 14/16] hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string Philippe Mathieu-Daudé
2019-01-04 17:58 ` Philippe Mathieu-Daudé [this message]
2019-01-07 7:38 ` [Qemu-devel] [PATCH 15/16] hw/devices: Move SMSC 91C111 declaration into a new header Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function Philippe Mathieu-Daudé
2019-01-04 19:35 ` Thomas Huth
2019-02-04 23:11 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190104175847.6290-16-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=andrew@aj.id.au \
--cc=aurelien@aurel32.net \
--cc=b.galvani@gmail.com \
--cc=balrogg@gmail.com \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=edgar.iglesias@gmail.com \
--cc=f4bug@amsat.org \
--cc=i.mitsyanko@gmail.com \
--cc=jan.kiszka@web.de \
--cc=jasowang@redhat.com \
--cc=joel@jms.id.au \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kraxel@redhat.com \
--cc=magnus.damm@gmail.com \
--cc=michael@walle.cc \
--cc=peter.chubb@nicta.com.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=robh@kernel.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).