[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/27] slirp: replace remaining qemu headers depende
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 20/27] slirp: replace remaining qemu headers dependency |
Date: |
Thu, 17 Jan 2019 15:43:52 +0400 |
Except for the migration code which is gated by WITH_QEMU, only
include our own headers, so libslirp can be built standalone.
Signed-off-by: Marc-André Lureau <address@hidden>
---
slirp/util.h | 22 ++++++++++++++++++++++
slirp/arp_table.c | 1 -
slirp/bootp.c | 1 -
slirp/cksum.c | 1 -
slirp/dhcpv6.c | 1 -
slirp/dnssearch.c | 1 -
slirp/if.c | 1 -
slirp/ip6_icmp.c | 1 -
slirp/ip6_input.c | 1 -
slirp/ip6_output.c | 2 --
slirp/ip_icmp.c | 1 -
slirp/ip_input.c | 1 -
slirp/ip_output.c | 1 -
slirp/mbuf.c | 1 -
slirp/misc.c | 2 --
slirp/ncsi.c | 1 -
slirp/ndp_table.c | 2 --
slirp/sbuf.c | 1 -
slirp/slirp.c | 2 --
slirp/socket.c | 2 --
slirp/tcp_input.c | 1 -
slirp/tcp_output.c | 1 -
slirp/tcp_subr.c | 1 -
slirp/tcp_timer.c | 1 -
slirp/tftp.c | 6 ++++--
slirp/udp.c | 1 -
slirp/udp6.c | 2 --
27 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/slirp/util.h b/slirp/util.h
index ef758045602..1937ffaacc0 100644
--- a/slirp/util.h
+++ b/slirp/util.h
@@ -48,6 +48,28 @@
# define SLIRP_PACKED __attribute__((packed))
#endif
+#ifndef DIV_ROUND_UP
+#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
+#endif
+
+#ifndef container_of
+#define container_of(ptr, type, member) __extension__ ({ \
+ void *__mptr = (void *)(ptr); \
+ ((type *)(__mptr - offsetof(type, member))); })
+#endif
+
+#if defined(_WIN32) /* CONFIG_IOVEC */
+# if !defined(IOV_MAX) /* XXX: to avoid duplicate with QEMU osdep.h */
+struct iovec {
+ void *iov_base;
+ size_t iov_len;
+};
+# endif
+#else
+#include <sys/uio.h>
+#endif
+
+
#define SCALE_MS 1000000
#define ETH_ALEN 6
diff --git a/slirp/arp_table.c b/slirp/arp_table.c
index bf71b984ad7..8ea655f79d2 100644
--- a/slirp/arp_table.c
+++ b/slirp/arp_table.c
@@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN])
diff --git a/slirp/bootp.c b/slirp/bootp.c
index 4c9a77eb98f..d396849a05e 100644
--- a/slirp/bootp.c
+++ b/slirp/bootp.c
@@ -21,7 +21,6 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#if defined(_WIN32)
diff --git a/slirp/cksum.c b/slirp/cksum.c
index 84c858fafb1..25bfa67348e 100644
--- a/slirp/cksum.c
+++ b/slirp/cksum.c
@@ -30,7 +30,6 @@
* in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp
*/
-#include "qemu/osdep.h"
#include "slirp.h"
/*
diff --git a/slirp/dhcpv6.c b/slirp/dhcpv6.c
index e27d9a46f84..9ffba38e8f4 100644
--- a/slirp/dhcpv6.c
+++ b/slirp/dhcpv6.c
@@ -20,7 +20,6 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#include "dhcpv6.h"
diff --git a/slirp/dnssearch.c b/slirp/dnssearch.c
index 8fb563321bc..c459cece8d6 100644
--- a/slirp/dnssearch.c
+++ b/slirp/dnssearch.c
@@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
static const uint8_t RFC3397_OPT_DOMAIN_SEARCH = 119;
diff --git a/slirp/if.c b/slirp/if.c
index 90b9078687f..2ad03b8a79b 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -5,7 +5,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
static void
diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c
index b3b7e50a311..2a432ebbd48 100644
--- a/slirp/ip6_icmp.c
+++ b/slirp/ip6_icmp.c
@@ -3,7 +3,6 @@
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#include "ip6_icmp.h"
diff --git a/slirp/ip6_input.c b/slirp/ip6_input.c
index ab656a0a9de..1b8c003c660 100644
--- a/slirp/ip6_input.c
+++ b/slirp/ip6_input.c
@@ -3,7 +3,6 @@
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#include "ip6_icmp.h"
diff --git a/slirp/ip6_output.c b/slirp/ip6_output.c
index 52c88ad6911..19d1ae77489 100644
--- a/slirp/ip6_output.c
+++ b/slirp/ip6_output.c
@@ -3,8 +3,6 @@
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
*/
-#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "slirp.h"
/* Number of packets queued before we start sending
diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c
index 19e247f773e..6b6344b7769 100644
--- a/slirp/ip_icmp.c
+++ b/slirp/ip_icmp.c
@@ -30,7 +30,6 @@
* ip_icmp.c,v 1.7 1995/05/30 08:09:42 rgrimes Exp
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#include "ip_icmp.h"
diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index d3606208383..774ce662e60 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -38,7 +38,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#include "ip_icmp.h"
diff --git a/slirp/ip_output.c b/slirp/ip_output.c
index db403f04c1e..f6ec141df59 100644
--- a/slirp/ip_output.c
+++ b/slirp/ip_output.c
@@ -38,7 +38,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
/* Number of packets queued before we start sending
diff --git a/slirp/mbuf.c b/slirp/mbuf.c
index d8d275e0e7b..521c02c9673 100644
--- a/slirp/mbuf.c
+++ b/slirp/mbuf.c
@@ -15,7 +15,6 @@
* the flags
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#define MBUF_THRESH 30
diff --git a/slirp/misc.c b/slirp/misc.c
index a77cc34b305..4662071be0a 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -5,9 +5,7 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
-#include "libslirp.h"
inline void
insque(void *a, void *b)
diff --git a/slirp/ncsi.c b/slirp/ncsi.c
index 85943822708..327f17543ce 100644
--- a/slirp/ncsi.c
+++ b/slirp/ncsi.c
@@ -6,7 +6,6 @@
* This code is licensed under the GPL version 2 or later. See the
* COPYING file in the top-level directory.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#include "ncsi-pkt.h"
diff --git a/slirp/ndp_table.c b/slirp/ndp_table.c
index b7b73722f79..34ea4fdf1fc 100644
--- a/slirp/ndp_table.c
+++ b/slirp/ndp_table.c
@@ -3,8 +3,6 @@
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
*/
-#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "slirp.h"
void ndp_table_add(Slirp *slirp, struct in6_addr ip_addr,
diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index c83e4dd8ed1..51a9f0cc7d4 100644
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -5,7 +5,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
static void sbappendsb(struct sbuf *sb, struct mbuf *m);
diff --git a/slirp/slirp.c b/slirp/slirp.c
index cfce82bbb5b..2c0ccc621b4 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -21,8 +21,6 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "slirp.h"
#ifdef WITH_QEMU
diff --git a/slirp/socket.c b/slirp/socket.c
index 2e8dc22fb62..dea201f5ce9 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -5,8 +5,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "slirp.h"
#include "ip_icmp.h"
#ifdef __sun__
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index 7c1fe18fec1..864da7d857d 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -38,7 +38,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#include "ip_icmp.h"
diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c
index 6dd1ecf5d9e..2b4335eb34a 100644
--- a/slirp/tcp_output.c
+++ b/slirp/tcp_output.c
@@ -38,7 +38,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
static const u_char tcp_outflags[TCP_NSTATES] = {
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index d8846a33b0c..879a7dcd296 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -38,7 +38,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
/* patchable/settable parameters for tcp */
diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c
index a843e57a2b9..703907eb37a 100644
--- a/slirp/tcp_timer.c
+++ b/slirp/tcp_timer.c
@@ -30,7 +30,6 @@
* tcp_timer.c,v 1.2 1994/08/02 07:49:10 davidg Exp
*/
-#include "qemu/osdep.h"
#include "slirp.h"
static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer);
diff --git a/slirp/tftp.c b/slirp/tftp.c
index 5c31886190f..2d8f9787862 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -22,9 +22,11 @@
* THE SOFTWARE.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
-#include "qemu-common.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
static inline int tftp_session_in_use(struct tftp_session *spt)
{
diff --git a/slirp/udp.c b/slirp/udp.c
index 3915971b506..ac42be0d8e9 100644
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -38,7 +38,6 @@
* terms and conditions of the copyright.
*/
-#include "qemu/osdep.h"
#include "slirp.h"
#include "ip_icmp.h"
diff --git a/slirp/udp6.c b/slirp/udp6.c
index fa531e03c4b..be5cba1f54d 100644
--- a/slirp/udp6.c
+++ b/slirp/udp6.c
@@ -3,8 +3,6 @@
* Guillaume Subiron
*/
-#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "slirp.h"
#include "udp.h"
#include "dhcpv6.h"
--
2.20.1.98.gecbdaf0899
- [Qemu-devel] [PATCH 16/27] slirp: remove qemu timer.h dependency, (continued)
- [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, 2019/01/17
- [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 <=
- [Qemu-devel] [PATCH 22/27] slirp: improve send_packet() callback, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 21/27] slirp: prefer c99 types over BSD kind, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 24/27] slirp: remove slirp_instances list, Marc-André Lureau, 2019/01/17
- [Qemu-devel] [PATCH 23/27] slirp: replace global polling with per-instance & notifier, Marc-André Lureau, 2019/01/17