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.mayd...@linaro.org> --- net/checksum.c | 1 + net/dump.c | 1 + net/eth.c | 1 + net/filter-buffer.c | 1 + net/filter.c | 1 + net/hub.c | 1 + net/l2tpv3.c | 2 +- net/net.c | 2 +- net/netmap.c | 3 +-- net/queue.c | 1 + net/slirp.c | 2 +- net/socket.c | 2 +- net/tap-aix.c | 2 +- net/tap-bsd.c | 1 + net/tap-haiku.c | 2 +- net/tap-linux.c | 1 + net/tap-solaris.c | 2 +- net/tap-win32.c | 2 +- net/tap.c | 3 +-- net/util.c | 3 +-- net/vde.c | 2 +- net/vhost-user.c | 1 + 22 files changed, 22 insertions(+), 15 deletions(-) diff --git a/net/checksum.c b/net/checksum.c index 14c0855..b5016ab 100644 --- 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 88d9582..dc0f339 100644 --- 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 7c61132..7e32d27 100644 --- 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 57be149..2353d5b 100644 --- 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 5d90f83..19f0f61 100644 --- 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 9ae9f01..b6d44fd 100644 --- 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 21d6119..824161c 100644 --- 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 87dd356..01ba117 100644 --- 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 5558368..a39ca4b 100644 --- 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 de8b9d3..9c32abd 100644 --- 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 f505570..e2b500b 100644 --- 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 e8605d4..e32e3cb 100644 --- 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 e84fc39..9d830b7 100644 --- 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 0103a97..83de19a 100644 --- 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 2e738ec..397e532 100644 --- 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 5bd9d21..0929cf7 100644 --- 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 0f60f78..e3907a8 100644 --- 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 7fddb20..38bbac0 100644 --- 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 85c4142..cfb6831 100644 --- 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 7e95076..0b3dbfe 100644 --- 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 4475d92..973faf5 100644 --- 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 e4dd089..451dbbf 100644 --- 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" -- 1.9.1