diff mbox series

[PULL,21/65] slirp: remove NO_UNIX_SOCKETS

Message ID	20190114000326.29847-22-samuel.thibault@ens-lyon.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> From: Samuel Thibault <samuel.thibault@ens-lyon.org> To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 01:02:42 +0100 Message-Id: <20190114000326.29847-22-samuel.thibault@ens-lyon.org> In-Reply-To: <20190114000326.29847-1-samuel.thibault@ens-lyon.org> References: <20190114000326.29847-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 21/65] slirp: remove NO_UNIX_SOCKETS Precedence: list Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>, Samuel Thibault <samuel.thibault@ens-lyon.org>, stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>
Series	[PULL,01/65] slirp: associate slirp_output callback with the Slirp context \| expand [PULL,01/65] slirp: associate slirp_output callback with the Slirp context [PULL,02/65] slirp: remove do_pty from fork_exec() [PULL,03/65] slirp: replace ex_pty with ex_chardev [PULL,04/65] slirp: use a dedicated field for chardev pointer [PULL,05/65] slirp: remove unused EMU_RSH [PULL,06/65] slirp: rename /extra/chardev [PULL,07/65] slirp: move internal function declarations [PULL,08/65] slirp: remove Monitor dependency, return a string for info [PULL,09/65] slirp: fix slirp_add_exec() leaks [PULL,10/65] slirp: replace the poor-man string split with g_strsplit() [PULL,11/65] slirp: remove dead declarations [PULL,12/65] slirp: add tftp tracing [PULL,13/65] slirp: move socket pair creation in helper function [PULL,14/65] slirp: remove unused M_TRAILINGSPACE [PULL,15/65] slirp: use a callback structure to interface with qemu [PULL,16/65] slirp: remove PROBE_CONN dead-code [PULL,17/65] slirp: remove FULL_BOLT [PULL,18/65] slirp: remove the disabled readv()/writev() code path [PULL,19/65] slirp: remove HAVE_SYS_SIGNAL_H [PULL,20/65] slirp: remove unused HAVE_SYS_BITYPES_H [PULL,21/65] slirp: remove NO_UNIX_SOCKETS [PULL,22/65] slirp: remove unused HAVE_SYS_STROPTS_H [PULL,23/65] slirp: remove unused HAVE_ARPA_INET_H [PULL,24/65] slirp: remove unused HAVE_SYS_WAIT_H [PULL,25/65] slirp: remove unused HAVE_SYS_SELECT_H [PULL,26/65] slirp: remove HAVE_SYS_IOCTL_H [PULL,27/65] slirp: remove HAVE_SYS_FILIO_H [PULL,28/65] slirp: remove unused DECLARE_IOVEC [PULL,29/65] slirp: remove unused HAVE_INET_ATON [PULL,30/65] slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent [PULL,31/65] slirp: replace SIZEOF_CHAR_P with glib equivalent [PULL,32/65] slirp: replace compile time DO_KEEPALIVE [PULL,33/65] slirp: remove unused global slirp_instance [PULL,34/65] slirp: replace error_report() with g_critical() [PULL,35/65] slirp: improve a bit the debug macros [PULL,36/65] slirp: add a callback to log guest errors [PULL,37/65] slirp: remove #if notdef dead code [PULL,38/65] slirp: remove unused sbflush() [PULL,39/65] slirp: NULL is defined by stddef.h [PULL,40/65] slirp: remove dead TCP_ACK_HACK code [PULL,41/65] slirp: replace ARRAY_SIZE with G_N_ELEMENTS [PULL,42/65] net: do not depend on slirp internals [PULL,43/65] glib-compat: add g_spawn_async_with_fds() fallback [PULL,44/65] slirp: simplify fork_exec() [PULL,45/65] slirp: replace error_report() with g_critical() [PULL,46/65] slirp: Enable fork_exec support on Windows [PULL,47/65] slirp: drop <Vista compatibility [PULL,48/65] slirp: rename exec_list [PULL,49/65] slirp: use virtual time for packet expiration [PULL,50/65] slirp: replace a fprintf with g_critical() [PULL,51/65] slirp: replace some fprintf() with DEBUG_MISC [PULL,52/65] slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG [PULL,53/65] slirp: no need to make DPRINTF conditional on DEBUG [PULL,54/65] slirp: always build with debug statements [PULL,55/65] slirp: introduce SLIRP_DEBUG environment variable [PULL,56/65] slirp: use %p for pointers format [PULL,57/65] slirp: remove remaining DEBUG blocks [PULL,58/65] slirp: replace DEBUG_ARGS with DEBUG_ARG [PULL,59/65] slirp: factor out guestfwd addition checks [PULL,60/65] slirp: add clock_get_ns() callback [PULL,61/65] build-sys: use a seperate slirp-obj-y && slirp.mo [PULL,62/65] slirp: set G_LOG_DOMAIN [PULL,63/65] slirp: call into g_debug() for DEBUG macros [PULL,64/65] slirp: Mark debugging calls as unlikely [PULL,65/65] slirp: check data length while emulating ident function

Commit Message

Samuel Thibault Jan. 14, 2019, 12:02 a.m. UTC

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 slirp/slirp.h        | 3 ---
 slirp/slirp_config.h | 6 ------
 2 files changed, 9 deletions(-)

diff mbox series

Patch

diff --git a/slirp/slirp.h b/slirp/slirp.h
index 57955a8965..fba77d0c3d 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -28,9 +28,6 @@  typedef char *caddr_t;
 #include <arpa/inet.h>
 #endif
 
-#ifndef NO_UNIX_SOCKETS
-#include <sys/un.h>
-#endif
 #ifndef _WIN32
 #include <sys/socket.h>
 #endif
diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
index a205dc8c28..4417b05d1c 100644
--- a/slirp/slirp_config.h
+++ b/slirp/slirp_config.h
@@ -58,9 +58,3 @@ 
 #ifndef _WIN32
 #define HAVE_INET_ATON
 #endif
-
-/* Define if you DON'T have unix-domain sockets */
-#undef NO_UNIX_SOCKETS
-#ifdef _WIN32
-#define NO_UNIX_SOCKETS
-#endif