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>
This commit is contained in:
Marc-André Lureau 2019-02-12 17:25:21 +01:00 committed by Samuel Thibault
parent 5a4af0d4ee
commit c2d63650d9
61 changed files with 31 additions and 36 deletions

View file

@ -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"

View file

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

View file

@ -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"

3
vl.c
View file

@ -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"