[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv4 20/32] slirp: remove now useless QEMU headers inclu
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULLv4 20/32] slirp: remove now useless QEMU headers inclusions |
Date: |
Thu, 7 Feb 2019 16:03:04 +0200 |
From: Marc-André Lureau <address@hidden>
Some of those could have been squashed earlier, but it is easier to do
it all here.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: samuel Thibault <address@hidden>
---
slirp/dhcpv6.c | 1 -
slirp/ip6_icmp.c | 2 --
slirp/misc.c | 2 --
slirp/sbuf.c | 1 -
slirp/slirp.c | 4 ----
slirp/slirp.h | 1 -
slirp/tftp.c | 1 -
slirp/util.h | 2 --
8 files changed, 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) \
--
2.20.1
- [Qemu-devel] [PULLv4 00/32] More work towards libslirp, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 02/32] slirp: Avoid marking naturally packed structs as QEMU_PACKED, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 09/32] slirp: replace trace functions with DEBUG calls, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 03/32] slirp: Don't mark struct ipq or struct ipasfrag as packed, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 13/32] slirp: add unregister_poll_fd() callback, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 08/32] slirp: add callbacks for timer, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 23/32] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 14/32] slirp: replace qemu_notify_event() with a callback, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 10/32] slirp: replace QEMU_PACKED with SLIRP_PACKED, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 01/32] slirp: Avoid unaligned 16bit memory access, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 20/32] slirp: remove now useless QEMU headers inclusions,
Samuel Thibault <=
- [Qemu-devel] [PULLv4 07/32] net/slirp: fix leaks on forwarding rule registration error, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 24/32] slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 05/32] net/slirp: simplify checking for cmd: prefix, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 06/32] net/slirp: free forwarding rules on cleanup, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 11/32] slirp: replace most qemu socket utilities with slirp own version, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 15/32] slirp: move QEMU state saving to a separate unit, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 21/32] slirp: replace net/eth.h inclusion with own defines, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 04/32] slirp: generalize guestfwd with a callback based approach, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 19/32] slirp: remove qemu timer.h dependency, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 16/32] slirp: do not include qemu headers in libslirp.h public API header, Samuel Thibault, 2019/02/07