From nobody Mon Sep 29 02:39:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547726809062546.1153548844135; Thu, 17 Jan 2019 04:06:49 -0800 (PST) Received: from localhost ([127.0.0.1]:42891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk6Rb-0004zt-VA for importer@patchew.org; Thu, 17 Jan 2019 07:06:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk67O-0006a6-Kn for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:45:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gk67M-0005rc-Vj for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:45:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55998) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gk67M-0005rF-MI for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:45:52 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7D7E18B320; Thu, 17 Jan 2019 11:45:51 +0000 (UTC) Received: from localhost (unknown [10.36.112.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0971C1048116; Thu, 17 Jan 2019 11:45:49 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2019 15:43:52 +0400 Message-Id: <20190117114359.5164-21-marcandre.lureau@redhat.com> In-Reply-To: <20190117114359.5164-1-marcandre.lureau@redhat.com> References: <20190117114359.5164-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 17 Jan 2019 11:45:51 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 20/27] slirp: replace remaining qemu headers dependency X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , Jan Kiszka , Jason Wang , Zhang Chen , Samuel Thibault , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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=C3=A9 Lureau --- 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 =20 +#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 =3D (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 +#endif + + #define SCALE_MS 1000000 =20 #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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALE= N]) 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" =20 #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 */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 /* 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 . */ =20 -#include "qemu/osdep.h" #include "slirp.h" #include "dhcpv6.h" =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 static const uint8_t RFC3397_OPT_DOMAIN_SEARCH =3D 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" #include "ip6_icmp.h" =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" #include "ip6_icmp.h" =20 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. */ =20 -#include "qemu/osdep.h" -#include "qemu-common.h" #include "slirp.h" =20 /* 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 */ =20 -#include "qemu/osdep.h" #include "slirp.h" #include "ip_icmp.h" =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" #include "ip_icmp.h" =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 /* 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 */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 #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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" -#include "libslirp.h" =20 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" =20 #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. */ =20 -#include "qemu/osdep.h" -#include "qemu-common.h" #include "slirp.h" =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 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" =20 #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. */ =20 -#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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" #include "ip_icmp.h" =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 static const u_char tcp_outflags[TCP_NSTATES] =3D { 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 /* 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 */ =20 -#include "qemu/osdep.h" #include "slirp.h" =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" -#include "qemu-common.h" + +#include +#include +#include =20 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. */ =20 -#include "qemu/osdep.h" #include "slirp.h" #include "ip_icmp.h" =20 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 */ =20 -#include "qemu/osdep.h" -#include "qemu-common.h" #include "slirp.h" #include "udp.h" #include "dhcpv6.h" --=20 2.20.1.98.gecbdaf0899