diff options
Diffstat (limited to 'hw/net')
38 files changed, 56 insertions, 6 deletions
diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index 50e8361..eecda52 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -16,12 +16,14 @@ * GNU General Public License for more details. * */ + #include "qemu/osdep.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/fifo8.h" #include "hw/net/allwinner_emac.h" #include "qemu/log.h" +#include "qemu/module.h" #include <zlib.h> static uint8_t padding[60]; diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 7f63411..d412085 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -28,6 +28,7 @@ #include "hw/net/cadence_gem.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "sysemu/dma.h" #include "net/checksum.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 5f82f43..df639f8 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -31,6 +31,7 @@ #include "qemu/osdep.h" #include "qemu/event_notifier.h" +#include "qemu/module.h" #include "qemu/thread.h" #include "qemu/sockets.h" #include "qapi/error.h" diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index fd20b88..7af0993 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/event_notifier.h" +#include "qemu/module.h" #include "qemu/thread.h" #include "qemu/sockets.h" #include "qapi/error.h" diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 23f7ff4..3f7312a 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/event_notifier.h" +#include "qemu/module.h" #include "qemu/thread.h" #include "qemu/sockets.h" #include "qapi/error.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 98cb4e5..bdb0b3b 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "qapi/error.h" +#include "qemu/module.h" #include "qemu/timer.h" #include <zlib.h> diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 121452d..1dc1466 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -33,6 +33,7 @@ #include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/range.h" #include "e1000x_common.h" diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 510ddb3..581f7d0 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -37,6 +37,7 @@ #include "qemu/units.h" #include "net/net.h" #include "net/tap.h" +#include "qemu/module.h" #include "qemu/range.h" #include "sysemu/sysemu.h" #include "hw/pci/msi.h" diff --git a/hw/net/e1000e_core.h b/hw/net/e1000e_core.h index 63a1551..49abb13 100644 --- a/hw/net/e1000e_core.h +++ b/hw/net/e1000e_core.h @@ -33,6 +33,9 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef HW_NET_E1000E_CORE_H +#define HW_NET_E1000E_CORE_H + #define E1000E_PHY_PAGE_SIZE (0x20) #define E1000E_PHY_PAGES (0x07) #define E1000E_MAC_SIZE (0x8000) @@ -151,3 +154,5 @@ e1000e_receive_iov(E1000ECore *core, const struct iovec *iov, int iovcnt); void e1000e_start_recv(E1000ECore *core); + +#endif diff --git a/hw/net/e1000x_common.h b/hw/net/e1000x_common.h index 0268884..19c56f4 100644 --- a/hw/net/e1000x_common.h +++ b/hw/net/e1000x_common.h @@ -22,6 +22,9 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef HW_NET_E1000X_COMMON_H +#define HW_NET_E1000X_COMMON_H + #include "e1000_regs.h" #define defreg(x) x = (E1000_##x >> 2) @@ -209,3 +212,5 @@ typedef struct e1000x_txd_props { void e1000x_read_tx_ctx_descr(struct e1000_context_desc *d, e1000x_txd_props *props); + +#endif diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index e761daf..6607c91 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -50,6 +50,7 @@ #include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "qemu/bitops.h" +#include "qemu/module.h" #include "qapi/error.h" /* QEMU sends frames smaller than 60 bytes to ethernet nics. diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c index 3685580..4cfbf11 100644 --- a/hw/net/etraxfs_eth.c +++ b/hw/net/etraxfs_eth.c @@ -28,6 +28,7 @@ #include "net/net.h" #include "hw/cris/etraxfs.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "trace.h" #define D(x) diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 0b66274..2a8b99a 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -33,6 +33,7 @@ #include "etsec.h" #include "registers.h" #include "qemu/log.h" +#include "qemu/module.h" /* #define HEX_DUMP */ /* #define DEBUG_REGISTER */ diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 7904303..eb76047 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -15,6 +15,7 @@ #include "hw/net/ftgmac100.h" #include "sysemu/dma.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/checksum.h" #include "net/eth.h" #include "hw/net/mii.h" diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 6e297c5..404154e 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -25,6 +25,7 @@ #include "hw/net/imx_fec.h" #include "sysemu/dma.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/checksum.h" #include "net/eth.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index b29e3fe..f6120be 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -18,6 +18,7 @@ #include "sysemu/sysemu.h" #include "hw/ptimer.h" #include "qemu/log.h" +#include "qemu/module.h" /* For crc32 */ #include <zlib.h> diff --git a/hw/net/lance.c b/hw/net/lance.c index f987b2f..2978c01 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -36,6 +36,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/sparc/sparc32_dma.h" #include "hw/net/lance.h" diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 0091e4e..78468fa 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -5,9 +5,11 @@ * * This code is licensed under the GPL */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "net/net.h" +#include "qemu/module.h" #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "hw/net/mii.h" diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index 85c9fc0..41ef7a4 100644 --- a/hw/net/milkymist-minimac2.c +++ b/hw/net/milkymist-minimac2.c @@ -24,13 +24,13 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */ #include "hw/hw.h" #include "hw/sysbus.h" #include "trace.h" #include "net/net.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include <zlib.h> diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c index 5ec1310..c5fbd84 100644 --- a/hw/net/mipsnet.c +++ b/hw/net/mipsnet.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "net/net.h" +#include "qemu/module.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index c7fdeb0..3490e54 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/isa/isa.h" #include "hw/net/ne2000-isa.h" @@ -29,6 +30,7 @@ #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "qemu/module.h" #define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE2000) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index ca792d9..1cf4b57 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -21,8 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "net/eth.h" +#include "qemu/module.h" #include "ne2000.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index d6f54f8..a5abb8d 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -36,6 +36,7 @@ #include "hw/net/mii.h" #include "hw/sysbus.h" #include "net/net.h" +#include "qemu/module.h" #include "net/eth.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 7c73855..600d09c 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" #include "net/net.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c index 0d60513..5ef4f93 100644 --- a/hw/net/rocker/qmp-norocker.c +++ b/hw/net/rocker/qmp-norocker.c @@ -16,7 +16,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qapi/error.h" #include "qapi/qapi-commands-rocker.h" #include "qapi/qmp/qerror.h" diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 5266f9b..bd54612 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "qapi/qapi-commands-rocker.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/bitops.h" #include "rocker.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 2342a09..0927317 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -49,12 +49,14 @@ */ /* For crc32 */ + #include "qemu/osdep.h" #include <zlib.h> #include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index d19ea07..4a612ee 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -12,6 +12,7 @@ #include "net/net.h" #include "hw/net/smc91c111.h" #include "qemu/log.h" +#include "qemu/module.h" /* For crc32 */ #include <zlib.h> diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index 63ba392..f162d49 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -24,11 +24,12 @@ * THE SOFTWARE. * */ + #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/net.h" #include "hw/qdev.h" #include "hw/ppc/spapr.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index b3375eb..2f645bf 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -6,10 +6,12 @@ * * This code is licensed under the GPL. */ + #include "qemu/osdep.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/log.h" +#include "qemu/module.h" #include <zlib.h> //#define DEBUG_STELLARIS_ENET 1 diff --git a/hw/net/sungem.c b/hw/net/sungem.c index 60f1e47..89bcf74 100644 --- a/hw/net/sungem.c +++ b/hw/net/sungem.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/net.h" #include "net/eth.h" #include "net/checksum.h" diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c index 7558fca..1ebaee3 100644 --- a/hw/net/sunhme.c +++ b/hw/net/sunhme.c @@ -27,6 +27,7 @@ #include "hw/pci/pci.h" #include "hw/net/mii.h" #include "net/net.h" +#include "qemu/module.h" #include "net/checksum.h" #include "net/eth.h" #include "sysemu/sysemu.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index ffe0872..c3f5fcc 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "hw/virtio/virtio.h" #include "net/net.h" #include "net/checksum.h" diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 4665dc9..10d01d0 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -21,8 +21,8 @@ #include "net/tap.h" #include "net/checksum.h" #include "sysemu/sysemu.h" -#include "qemu-common.h" #include "qemu/bswap.h" +#include "qemu/module.h" #include "hw/pci/msix.h" #include "hw/pci/msi.h" #include "migration/register.h" diff --git a/hw/net/vmxnet3_defs.h b/hw/net/vmxnet3_defs.h index 6c19d29..65780c5 100644 --- a/hw/net/vmxnet3_defs.h +++ b/hw/net/vmxnet3_defs.h @@ -12,9 +12,11 @@ * * This work is licensed under the terms of the GNU GPL, version 2. * See the COPYING file in the top-level directory. - * */ +#ifndef HW_NET_VMXNET3_DEFS_H +#define HW_NET_VMXNET3_DEFS_H + #include "net/net.h" #include "hw/net/vmxnet3.h" @@ -131,3 +133,5 @@ typedef struct { /* Compatibility flags for migration */ uint32_t compat_flags; } VMXNET3State; + +#endif diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index 63f5a62..f49df95 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/net.h" #ifdef DEBUG_XGMAC diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index cc880a3..feeaca6 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/net.h" #include "net/checksum.h" diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 35de353..8f3a8f8 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" /* FIXME should not use tswap* */ #include "hw/sysbus.h" #include "hw/hw.h" |