hw/net: Remove unnecessary header includes

Headers like "hw/loader.h" and "qemu/sockets.h" are not needed in
the hw/net/*.c files. And Some other headers are included via other
headers already, so we can drop them, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 804ec08721659f20bd5df7adfcd1fe047953fc2c..c7f1695f57a3534c663546059ddf487ce00068a1 100644 (file)
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -30,7 +30,6 @@
 #include "hw/pci/pci.h"
 #include "net/net.h"
 #include "net/checksum.h"
-#include "hw/loader.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 #include "qemu/iov.h"

diff --git a/hw/net/lance.c b/hw/net/lance.c
index 0028bc525d3086cde7377c7c57e6c9389e63e1e9..a08d5ac6a848163e7398f2afbae4d8776537f7fe 100644 (file)
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -36,10 +36,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
-#include "net/net.h"
 #include "qemu/timer.h"
-#include "qemu/sockets.h"
 #include "hw/sparc/sparc32_dma.h"
 #include "hw/net/lance.h"
 #include "trace.h"

diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index 687ef84aaca79162f66ed5730f45b8f662041ed9..3a9fc89e484b6e6db817adfa5342b00eacb8743e 100644 (file)
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -23,10 +23,8 @@
  */
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "net/net.h"
 #include "net/eth.h"
 #include "ne2000.h"
-#include "hw/loader.h"
 #include "sysemu/sysemu.h"
 
 /* debug NE2000 card */

diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index 0ae5ca4701910e8033b46f2462d3d0ad71bd929e..70dc8b3f0cdbcd08e01dd22c6301cbaff010310b 100644 (file)
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -30,7 +30,6 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"
-#include "hw/loader.h"
 #include "qemu/timer.h"
 #include "sysemu/dma.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 606b05c09fc3c89329f7ffc8616f6e119bccd191..0c44554168a6de3a5b031fb718869d4570e8254b 100644 (file)
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -40,7 +40,6 @@
 #include "net/net.h"
 #include "net/eth.h"
 #include "qemu/timer.h"
-#include "qemu/sockets.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
 

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 1cc95b8cba86604048b5523c6986859b2c67f8f1..46daa16202c3be7637f07a856677c8b0571d896f 100644 (file)
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -58,9 +58,7 @@
 #include "qemu/timer.h"
 #include "net/net.h"
 #include "net/eth.h"
-#include "hw/loader.h"
 #include "sysemu/sysemu.h"
-#include "qemu/iov.h"
 
 /* debug RTL8139 card */
 //#define DEBUG_RTL8139 1

diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 0843bf185c147db54f82bc841bb089818d4018bb..fa001563d3de3c7d25da207f6803e22b670c4729 100644 (file)
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -28,7 +28,6 @@
 #include "hw/sysbus.h"
 #include "qemu/log.h"
 #include "net/net.h"
-#include "net/checksum.h"
 
 #ifdef DEBUG_XGMAC
 #define DEBUGF_BRK(message, args...) do { \