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>

diff --git a/slirp/dhcpv6.c b/slirp/dhcpv6.c
index 752df405361241b0597b6498a44f21611e1d131d..e27d9a46f845d2713aee1fccc5d103bd972dbfd6 100644 (file)
--- 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 682597e6762adf753f3555eb6fd57f281ef9513a..b3b7e50a311a56f483204a18338febffa21ca408 100644 (file)
--- 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 4ee20a10e44b8c8493d675126b1c7121a48bc743..a77cc34b30587fbf7a4294ede84419fbc6921cac 100644 (file)
--- 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 17f28e97a63d0742a5a1a8366dfa1a1f2a62a0a8..c83e4dd8ed1d9653360aa2871708dbb252b6dfcc 100644 (file)
--- 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 7a5d97c77f1efed1b9cbed6208c11d61feafecbd..ec1f606d725aff9f5c52f4c065011b67fd9f817d 100644 (file)
--- 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 5a830ddcb86d0f69dbe43bc0b8d46d16f670bc3c..5707805be225ca0ef7e019abf869faaff47589af 100644 (file)
--- 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 f0bcc72c925868beaa7b7c54912468219fe38f86..5c31886190ff3a9519f5e223d6c0c4e47fe75dee 100644 (file)
--- 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 922077435e99a584ee911cca1990df595993f4c5..4664e8159ba37afb308f451a40fb609accb03ec4 100644 (file)
--- 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)        \