[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/27] slirp: remove now useless QEMU headers inclus
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 17/27] slirp: remove now useless QEMU headers inclusions |
Date: |
Thu, 17 Jan 2019 15:43:49 +0400 |
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>
---
slirp/slirp.h | 1 -
slirp/dhcpv6.c | 1 -
slirp/ip6_icmp.c | 2 --
slirp/misc.c | 2 --
slirp/sbuf.c | 1 -
slirp/slirp.c | 4 ----
slirp/tftp.c | 1 -
7 files changed, 12 deletions(-)
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 5a830ddcb86..5707805be22 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/dhcpv6.c b/slirp/dhcpv6.c
index 752df405361..e27d9a46f84 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 682597e6762..b3b7e50a311 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 4ee20a10e44..a77cc34b305 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 17f28e97a63..c83e4dd8ed1 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 8067b624eaf..cfce82bbb5b 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/tftp.c b/slirp/tftp.c
index f0bcc72c925..5c31886190f 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)
{
--
2.20.1.98.gecbdaf0899
- [Qemu-devel] [PATCH 10/27] slirp: add unregister_poll_fd() callback, (continued)
- [Qemu-devel] [PATCH 10/27] slirp: add unregister_poll_fd() callback, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 13/27] slirp: do not include qemu headers in libslirp.h public API header, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 12/27] slirp: move QEMU state saving to a separate unit, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 14/27] slirp: improve windows headers inclusion, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 16/27] slirp: remove qemu timer.h dependency, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 17/27] slirp: remove now useless QEMU headers inclusions,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 15/27] slirp: add slirp own version of pstrcpy, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 18/27] slirp: replace net/eth.h inclusion with own defines, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 19/27] slirp: replace qemu qtailq with slirp own copy, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 20/27] slirp: replace remaining qemu headers dependency, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 22/27] slirp: improve send_packet() callback, Marc-André Lureau, 2019/01/17