diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-01-17 15:43:49 +0400 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-02-07 15:49:08 +0200 |
| commit | e44203db9d076d5c8d92f2088d9b83ecf1858b55 (patch) | |
| tree | 89d3bdd96056b0e3de2d6be78e62dc9c21f51761 /slirp | |
| parent | 759c5a6ab515d5d8c008a6ad996778cd1abdcdd7 (diff) | |
slirp: remove now useless QEMU headers inclusions
Some of those could have been squashed earlier, but it is easier to do
it all here.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/dhcpv6.c | 1 | ||||
| -rw-r--r-- | slirp/ip6_icmp.c | 2 | ||||
| -rw-r--r-- | slirp/misc.c | 2 | ||||
| -rw-r--r-- | slirp/sbuf.c | 1 | ||||
| -rw-r--r-- | slirp/slirp.c | 4 | ||||
| -rw-r--r-- | slirp/slirp.h | 1 | ||||
| -rw-r--r-- | slirp/tftp.c | 1 | ||||
| -rw-r--r-- | slirp/util.h | 2 |
8 files changed, 0 insertions, 14 deletions
diff --git a/slirp/dhcpv6.c b/slirp/dhcpv6.c index 752df40536..e27d9a46f8 100644 --- a/slirp/dhcpv6.c +++ b/slirp/dhcpv6.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" -#include "qemu/log.h" #include "slirp.h" #include "dhcpv6.h" diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index 682597e676..b3b7e50a31 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -6,8 +6,6 @@ #include "qemu/osdep.h" #include "slirp.h" #include "ip6_icmp.h" -#include "qemu/error-report.h" -#include "qemu/log.h" #define NDP_Interval g_rand_int_range(slirp->grand, \ NDP_MinRtrAdvInterval, NDP_MaxRtrAdvInterval) diff --git a/slirp/misc.c b/slirp/misc.c index 4ee20a10e4..a77cc34b30 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -8,8 +8,6 @@ #include "qemu/osdep.h" #include "slirp.h" #include "libslirp.h" -#include "qemu/error-report.h" -#include "qemu/main-loop.h" inline void insque(void *a, void *b) diff --git a/slirp/sbuf.c b/slirp/sbuf.c index 17f28e97a6..c83e4dd8ed 100644 --- a/slirp/sbuf.c +++ b/slirp/sbuf.c @@ -7,7 +7,6 @@ #include "qemu/osdep.h" #include "slirp.h" -#include "qemu/main-loop.h" static void sbappendsb(struct sbuf *sb, struct mbuf *m); diff --git a/slirp/slirp.c b/slirp/slirp.c index 7a5d97c77f..ec1f606d72 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -23,11 +23,7 @@ */ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qemu/error-report.h" -#include "migration/register.h" #include "slirp.h" -#include "hw/hw.h" -#include "qemu/cutils.h" #ifdef WITH_QEMU #include "state.h" diff --git a/slirp/slirp.h b/slirp/slirp.h index 5a830ddcb8..5707805be2 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -48,7 +48,6 @@ typedef char *caddr_t; #include "util.h" #include "qemu/queue.h" -#include "qemu/sockets.h" #include "net/eth.h" #include "libslirp.h" diff --git a/slirp/tftp.c b/slirp/tftp.c index f0bcc72c92..5c31886190 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "slirp.h" #include "qemu-common.h" -#include "qemu/cutils.h" static inline int tftp_session_in_use(struct tftp_session *spt) { diff --git a/slirp/util.h b/slirp/util.h index 922077435e..4664e8159b 100644 --- a/slirp/util.h +++ b/slirp/util.h @@ -53,9 +53,7 @@ #ifdef _WIN32 int slirp_closesocket(int fd); int slirp_ioctlsocket(int fd, int req, void *val); -#ifndef WITH_QEMU int inet_aton(const char *cp, struct in_addr *ia); -#endif #define slirp_getsockopt(sockfd, level, optname, optval, optlen) \ getsockopt(sockfd, level, optname, (void *)optval, optlen) #define slirp_setsockopt(sockfd, level, optname, optval, optlen) \ |