net: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1454089805-5470-11-git-send-email-peter.maydell@linaro.org

diff --git a/net/checksum.c b/net/checksum.c
index 14c08550e0c88535a944615e2068bb890e3ea78e..b5016ab40cd3bd742488201b91394baed82192e1 100644 (file)
--- a/net/checksum.c
+++ b/net/checksum.c
@@ -15,6 +15,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "net/checksum.h"
 

diff --git a/net/dump.c b/net/dump.c
index 88d9582334babab05abb92f05909e6da2bb8ca0d..dc0f33948dbba8ec030fbf1c525c5fe49e10a0aa 100644 (file)
--- a/net/dump.c
+++ b/net/dump.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "clients.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"

diff --git a/net/eth.c b/net/eth.c
index 7c61132cbb1555638b523bc3b34178a78031fa15..7e32d274c7c9272658b4dfe1995d272ff478acd0 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "net/eth.h"
 #include "net/checksum.h"
 #include "qemu-common.h"

diff --git a/net/filter-buffer.c b/net/filter-buffer.c
index 57be149413f928c629d1f93472372a9f9c104a72..2353d5bc756614137aa536013afbc159c41c82d2 100644 (file)
--- a/net/filter-buffer.c
+++ b/net/filter-buffer.c
@@ -6,6 +6,7 @@
  * later.  See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "net/filter.h"
 #include "net/queue.h"
 #include "qemu-common.h"

diff --git a/net/filter.c b/net/filter.c
index 8f07b991274c6671f81c31935c37afdbe2bd6bc0..d2a514eb8d2b8968e59e2a6e97b41c805e5abd88 100644 (file)
--- a/net/filter.c
+++ b/net/filter.c
@@ -6,6 +6,7 @@
  * later.  See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"

diff --git a/net/hub.c b/net/hub.c
index 9ae9f012cb36224026c657d814c5582b33be202b..b6d44fd75ba0e98bced09c189f9e125d42554601 100644 (file)
--- a/net/hub.c
+++ b/net/hub.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "monitor/monitor.h"
 #include "net/net.h"
 #include "clients.h"

diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index 21d6119ed40eaa6ef38765c5a4a22b3b27dbda98..824161c5b82b6d1382efa931cbd8b5379f560a8c 100644 (file)
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -23,9 +23,9 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <linux/ip.h>
 #include <netdb.h>
-#include "config-host.h"
 #include "net/net.h"
 #include "clients.h"
 #include "qemu-common.h"

diff --git a/net/net.c b/net/net.c
index 55ce154a0e578514a964b84f72366cefafc4d74e..c5e414fe3c00364619d19e2be5a7642566c32198 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 #include "net/net.h"
 #include "clients.h"

diff --git a/net/netmap.c b/net/netmap.c
index 27295ab2e269d1049f124e4ebd95b0dd2f4015f1..971032120c1251dc1b89e9b1ef1e51eb95871f20 100644 (file)
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -23,11 +23,10 @@
  */
 
 
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <sys/mman.h>
-#include <stdint.h>
-#include <stdio.h>
 #define NETMAP_WITH_LIBS
 #include <net/netmap.h>
 #include <net/netmap_user.h>

diff --git a/net/queue.c b/net/queue.c
index de8b9d31c6ef85804d8721f45fcd1c4dbc82f0e9..9c32abdb8f44b88acd368ca5f7339e255c0b74eb 100644 (file)
--- a/net/queue.c
+++ b/net/queue.c
@@ -21,6 +21,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "net/queue.h"
 #include "qemu/queue.h"
 #include "net/net.h"

diff --git a/net/slirp.c b/net/slirp.c
index eac4fc2506c026455e7dfd6e5b2f57bdb27cf16e..6b51fbc3065ada94ce2edcd233d3154189bf9f55 100644 (file)
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "net/slirp.h"
 
-#include "config-host.h"
 
 #ifndef _WIN32
 #include <pwd.h>

diff --git a/net/socket.c b/net/socket.c
index e8605d4ded9c946537ce7567d43fe86055310bf2..e32e3cb9963734c8fc19cc4fdf7e39bbad21e6d4 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 #include "net/net.h"
 #include "clients.h"

diff --git a/net/tap-aix.c b/net/tap-aix.c
index e84fc3913634715ce3cdbbdc6e707b0b31eeeb77..9d830b7a3277a73c107043780fd4403c7436190e 100644 (file)
--- a/net/tap-aix.c
+++ b/net/tap-aix.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "tap_int.h"
-#include <stdio.h>
 
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
              int vnet_hdr_required, int mq_required, Error **errp)

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 0103a97bf6bfddb656df8d9915602223650b02d8..83de19a64654a888483dc767c9d295af9aa7c6d9 100644 (file)
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "tap_int.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"

diff --git a/net/tap-haiku.c b/net/tap-haiku.c
index 2e738ec6a332a3970890a546005469db0eaa7a47..397e53235e5bcab05fe55ad4b480780d6661ef75 100644 (file)
--- a/net/tap-haiku.c
+++ b/net/tap-haiku.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "tap_int.h"
-#include <stdio.h>
 
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
              int vnet_hdr_required, int mq_required, Error **errp)

diff --git a/net/tap-linux.c b/net/tap-linux.c
index 5bd9d21898e74313e64d9ee661a4aadcb108ec14..0929cf76f5b680ec07d59a6c4b35f20dbdadbe71 100644 (file)
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "tap_int.h"
 #include "tap-linux.h"
 #include "net/tap.h"

diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 0f60f78dd059c468cfb418415d8990115f049e62..e3907a8218e97893363ccab66e9515b20f3dc0fa 100644 (file)
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "tap_int.h"
 #include "sysemu/sysemu.h"
 
-#include <sys/stat.h>
 #include <sys/ethernet.h>
 #include <sys/sockio.h>
 #include <netinet/arp.h>

diff --git a/net/tap-win32.c b/net/tap-win32.c
index 7fddb20b5179a96ed0b9fa69722a16c95a5f2d16..38bbac0cd92e881d9f82d3f4f8e2d13557a3b4e8 100644 (file)
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -26,6 +26,7 @@
  *  distribution); if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "tap_int.h"
 
 #include "qemu-common.h"
@@ -34,7 +35,6 @@
 #include "net/tap.h"            /* tap_has_ufo, ... */
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
-#include <stdio.h>
 #include <windows.h>
 #include <winioctl.h>
 

diff --git a/net/tap.c b/net/tap.c
index 85c4142d15534b6ad7dca419397092afb8ebdb8a..cfb6831988d90690aaaa7161fce9ee42e37d0c46 100644 (file)
--- a/net/tap.c
+++ b/net/tap.c
@@ -23,12 +23,11 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "tap_int.h"
 
-#include "config-host.h"
 
 #include <sys/ioctl.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <net/if.h>

diff --git a/net/util.c b/net/util.c
index 7e9507679d74a42ba78f4730636f2574eae57041..0b3dbfe5d344ba3ba07bcbc61321c752d22582d7 100644 (file)
--- a/net/util.c
+++ b/net/util.c
@@ -22,9 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "util.h"
-#include <errno.h>
-#include <stdlib.h>
 
 int net_parse_macaddr(uint8_t *macaddr, const char *p)
 {

diff --git a/net/vde.c b/net/vde.c
index 4475d929e62cebb6949b903b3881ed05630cb2fa..973faf509004fe4ac75fd899b089616b81bd35ea 100644 (file)
--- a/net/vde.c
+++ b/net/vde.c
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 #include <libvdeplug.h>
 

diff --git a/net/vhost-user.c b/net/vhost-user.c
index e4dd089c5cce31c35ed0a1183146100ddd0f0413..451dbbfb27db5af8043c7c2be01a3724b6059b5f 100644 (file)
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "clients.h"
 #include "net/vhost_net.h"
 #include "net/vhost-user.h"