net: do not include net.h everywhere

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch_init.c b/arch_init.c
index ef866cdea41a5248441d171bfa16d71984ff5987..e479a2566cc57f1c71fc4b3a725fdd7852b1c5f4 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -40,7 +40,6 @@
 #include "hw/audiodev.h"
 #include "kvm.h"
 #include "migration.h"
-#include "net.h"
 #include "gdbstub.h"
 #include "hw/smbios.h"
 #include "exec-memory.h"

diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h
index b1e52585b3501bafddc4924baa0b86cf04bf6e27..348f55c27e9429b8939ab000d91fd85ace3cb211 100644 (file)
--- a/hw/alpha_sys.h
+++ b/hw/alpha_sys.h
@@ -6,7 +6,6 @@
 #include "pci/pci.h"
 #include "pci/pci_host.h"
 #include "ide.h"
-#include "net.h"
 #include "pc.h"
 #include "irq.h"
 

diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index 839b9ea1d45a68ac2bb4cd2833d8dc08b60a4f6f..336ffc2274b88cab5fbdb1c667e56ace409170cc 100644 (file)
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -24,7 +24,6 @@
 
 #include "hw.h"
 #include "boards.h"
-#include "net.h"
 #include "blockdev.h"
 #include "qemu-config.h"
 #include "sysemu.h"

diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index 772cb8b0532485097bab95f42956724982beb967..f59d3bfef8d83f9a37187c5c3a8d512bacaabd12 100644 (file)
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -19,7 +19,6 @@
 
 #include "sysbus.h"
 #include "hw.h"
-#include "net.h"
 #include "flash.h"
 #include "devices.h"
 #include "boards.h"

diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h
index 96b2a7f863c7e699a68ce2856c062d1a76b2730c..0253b7ab26ad8834fdd0d9b17ca326e668c70b2a 100644 (file)
--- a/hw/milkymist-hw.h
+++ b/hw/milkymist-hw.h
@@ -3,6 +3,7 @@
 
 #include "qdev.h"
 #include "qdev-addr.h"
+#include "net.h"
 
 static inline DeviceState *milkymist_uart_create(hwaddr base,
         qemu_irq irq)

diff --git a/hw/milkymist.c b/hw/milkymist.c
index 4c8111a74dbf59c975c198282623a053ed7030cc..c26ea4aed26475f8778490a81c0287c5bd90f769 100644 (file)
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -19,7 +19,6 @@
 
 #include "sysbus.h"
 #include "hw.h"
-#include "net.h"
 #include "flash.h"
 #include "sysemu.h"
 #include "devices.h"

diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index e0ac2d1ec20e91f6b9e42ee1cd7fead76f1e4c2a..169dd4683ddeef300cd8447497bfc3fc9e778bf6 100644 (file)
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -20,7 +20,6 @@
 #include "hw.h"
 #include "block.h"
 #include "sysemu.h"
-#include "net.h"
 #include "boards.h"
 #include "monitor.h"
 #include "loader.h"

diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index e3d4b237f1794c28cf8218e4b6dc84927ed09176..2d811320cad2bd534f0c250d20b10d3384d05722 100644 (file)
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -34,7 +34,6 @@
 #include "hw.h"
 #include "scsi.h"
 #include "scsi-defs.h"
-#include "net.h" /* Remove that when we can */
 #include "srp.h"
 #include "hw/qdev.h"
 #include "hw/spapr.h"

diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 6ab8fee0c13a09b25b1fe887bcb00c75b01bee80..1fdbc497cc0b12d1be9e5f01cc241f4c2b897cec 100644 (file)
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -25,7 +25,6 @@
 #include "sysbus.h"
 #include "hw.h"
 #include "serial.h"
-#include "net.h"
 #include "flash.h"
 #include "sysemu.h"
 #include "devices.h"

diff --git a/hw/virtio-net.h b/hw/virtio-net.h
index b13be7ccb522f27416868032e2b6a4d756bc865c..2566ea13ece10a76a3c3b060fdba5e8a42c72746 100644 (file)
--- a/hw/virtio-net.h
+++ b/hw/virtio-net.h
@@ -15,7 +15,6 @@
 #define _QEMU_VIRTIO_NET_H
 
 #include "virtio.h"
-#include "net.h"
 #include "pci/pci.h"
 
 #define ETH_ALEN    6

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index d0d6a5e816dd486f98f946b4ce17847d5f8679b0..a2355dc8673e9a88077e0ad2ef02ef7fe1d65a2b 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -26,7 +26,6 @@
 #include "qemu-error.h"
 #include "pci/msi.h"
 #include "pci/msix.h"
-#include "net.h"
 #include "loader.h"
 #include "kvm.h"
 #include "blockdev.h"

diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h
index 7d7cba752dd36c237532b238596669f676c4844f..8d9d15f0939bb95303e508a3f6863164050f4aa7 100644 (file)
--- a/hw/virtio-scsi.h
+++ b/hw/virtio-scsi.h
@@ -15,7 +15,6 @@
 #define _QEMU_VIRTIO_SCSI_H
 
 #include "virtio.h"
-#include "net.h"
 #include "pci/pci.h"
 
 /* The ID for virtio_scsi */

diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index fea86dd78bd0be28bfecb5ec2fe78440238069e8..330563090349075c5d3fd4b27193482727de301e 100644 (file)
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -4,7 +4,6 @@
 #include "xen_common.h"
 #include "sysemu.h"
 #include "net.h"
-#include "net/hub.h"
 
 /* ------------------------------------------------------------- */
 

diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index 10bb560073156779a67c3194aa3a5c41057544c1..023499eb5527eb09c2e66ea8bf791269e0c79a49 100644 (file)
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -30,7 +30,6 @@
 #include "pci/pci.h"
 #include "irq.h"
 #include "xen_common.h"
-#include "net.h"
 #include "xen_backend.h"
 #include "trace.h"
 #include "exec-memory.h"

diff --git a/input.c b/input.c
index 25d3973e214ad71fd3f49bcbcf1f95e51dc9a6b8..123bb237d48fa0b6650e88c268cc2b24ccfc8005 100644 (file)
--- a/input.c
+++ b/input.c
@@ -23,7 +23,6 @@
  */
 
 #include "sysemu.h"
-#include "net.h"
 #include "monitor.h"
 #include "console.h"
 #include "error.h"

diff --git a/qemu-char.c b/qemu-char.c
index 242b799909fc5efa8c03fe59746d8dd1c13e9418..f066ad0654df4f22c50da4397f85bdb672d57dc2 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "net.h"
 #include "monitor.h"
 #include "console.h"
 #include "sysemu.h"

diff --git a/qemu-timer.c b/qemu-timer.c
index 0d2bb94289bdd92fb4581996d2b691ed2d2e1196..9b9585b259681a8e5ea1b406e7947e7f38b6a041 100644 (file)
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -23,7 +23,6 @@
  */
 
 #include "sysemu.h"
-#include "net.h"
 #include "monitor.h"
 #include "console.h"