slirp: move sources to src/ subdirectory

Prepare for making slirp/ a standalone project.

Remove some useless includes while at it.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190212162524.31504-5-marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

net/slirp.c

@@ -37,7 +37,7 @@
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
-#include "slirp/libslirp.h"
+#include "slirp/src/libslirp.h"
 #include "chardev/char-fe.h"
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"

slirp/Makefile.objs

@@ -1,36 +1,36 @@
 slirp-obj-y = slirp.mo
 
 slirp.mo-objs = \
-	arp_table.o \
+	src/arp_table.o \
-	bootp.o \
+	src/bootp.o \
-	cksum.o \
+	src/cksum.o \
-	dhcpv6.o \
+	src/dhcpv6.o \
-	dnssearch.o \
+	src/dnssearch.o \
-	if.o \
+	src/if.o \
-	ip6_icmp.o \
+	src/ip6_icmp.o \
-	ip6_input.o \
+	src/ip6_input.o \
-	ip6_output.o \
+	src/ip6_output.o \
-	ip_icmp.o \
+	src/ip_icmp.o \
-	ip_input.o \
+	src/ip_input.o \
-	ip_output.o \
+	src/ip_output.o \
-	mbuf.o \
+	src/mbuf.o \
-	misc.o \
+	src/misc.o \
-	ncsi.o \
+	src/ncsi.o \
-	ndp_table.o \
+	src/ndp_table.o \
-	sbuf.o \
+	src/sbuf.o \
-	slirp.o \
+	src/slirp.o \
-	socket.o \
+	src/socket.o \
-	state.o \
+	src/state.o \
-	stream.o \
+	src/stream.o \
-	tcp_input.o \
+	src/tcp_input.o \
-	tcp_output.o \
+	src/tcp_output.o \
-	tcp_subr.o \
+	src/tcp_subr.o \
-	tcp_timer.o \
+	src/tcp_timer.o \
-	tftp.o \
+	src/tftp.o \
-	udp.o \
+	src/udp.o \
-	udp6.o \
+	src/udp6.o \
-	util.o \
+	src/util.o \
-	vmstate.o \
+	src/vmstate.o \
 	$(NULL)
 
 slirp.mo-cflags = -DG_LOG_DOMAIN=\"Slirp\"

util/main-loop.c

@@ -26,11 +26,9 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "qemu/timer.h"
-#include "qemu/sockets.h"	// struct in_addr needed for libslirp.h
 #include "sysemu/qtest.h"
 #include "sysemu/cpus.h"
 #include "sysemu/replay.h"
-#include "slirp/libslirp.h"
 #include "qemu/main-loop.h"
 #include "block/aio.h"
 #include "qemu/error-report.h"

vl.c

@@ -106,9 +106,6 @@ int main(int argc, char **argv)
 
 #include "disas/disas.h"
 
-
-#include "slirp/libslirp.h"
-
 #include "trace-root.h"
 #include "trace/control.h"
 #include "qemu/queue.h"