[Qemu-devel] [PATCH 0/7] slirp: make it a standalone project

[Marc-André Lureau]

Hi,

As discussed earlier in "[PATCH for-3.2 00/41] RFC: slirp: make it
again a standalone project" and other threads, it would be useful to
make slirp a separate project.

In the previous thread "[PATCH slirp 0/5] Make it a standalone
project", it was recommended by Peter that we keep the submodule build
for a while, until libslirp is released with stability commitments.

This patch series is to be applied on QEMU source tree, and modify
slirp/ to make it easily submodule-able or build QEMU against a system
installed version.

Based-on: <address@hidden>

Marc-André Lureau (7):
  slirp: adapt a subset of QEMU vmstate code
  slirp: use libslirp migration code
  slirp: use "slirp_" prefix for inet_aton() win32 implementation
  slirp: move sources to src/ subdirectory
  slirp: add a standalone Makefile
  build-sys: link with slirp as an external project
  slirp: remove QEMU Makefile.objs

 include/migration/qemu-file-types.h |   2 +
 migration/qemu-file.h               |   1 -
 slirp/{ => src}/bootp.h             |   0
 slirp/{ => src}/debug.h             |   0
 slirp/{ => src}/dhcpv6.h            |   0
 slirp/{ => src}/if.h                |   0
 slirp/{ => src}/ip.h                |   0
 slirp/{ => src}/ip6.h               |   0
 slirp/{ => src}/ip6_icmp.h          |   0
 slirp/{ => src}/ip_icmp.h           |   0
 slirp/{ => src}/libslirp.h          |   9 +
 slirp/{ => src}/main.h              |   0
 slirp/{ => src}/mbuf.h              |   0
 slirp/{ => src}/misc.h              |   0
 slirp/{ => src}/ncsi-pkt.h          |   0
 slirp/{ => src}/qtailq.h            |   0
 slirp/{ => src}/sbuf.h              |   0
 slirp/{ => src}/slirp.h             |   0
 slirp/{ => src}/socket.h            |   0
 slirp/src/state.h                   |   0
 slirp/src/stream.h                  |  34 +++
 slirp/{ => src}/tcp.h               |   0
 slirp/{ => src}/tcp_timer.h         |   0
 slirp/{ => src}/tcp_var.h           |   0
 slirp/{ => src}/tcpip.h             |   0
 slirp/{ => src}/tftp.h              |   0
 slirp/{ => src}/udp.h               |   0
 slirp/{ => src}/util.h              |   4 +-
 slirp/src/vmstate.h                 | 396 +++++++++++++++++++++++++++
 slirp/state.h                       |   9 -
 net/slirp.c                         |  57 +++-
 slirp/{ => src}/arp_table.c         |   0
 slirp/{ => src}/bootp.c             |   0
 slirp/{ => src}/cksum.c             |   0
 slirp/{ => src}/dhcpv6.c            |   0
 slirp/{ => src}/dnssearch.c         |   0
 slirp/{ => src}/if.c                |   0
 slirp/{ => src}/ip6_icmp.c          |   0
 slirp/{ => src}/ip6_input.c         |   0
 slirp/{ => src}/ip6_output.c        |   0
 slirp/{ => src}/ip_icmp.c           |   0
 slirp/{ => src}/ip_input.c          |   0
 slirp/{ => src}/ip_output.c         |   0
 slirp/{ => src}/mbuf.c              |   0
 slirp/{ => src}/misc.c              |   0
 slirp/{ => src}/ncsi.c              |   0
 slirp/{ => src}/ndp_table.c         |   0
 slirp/{ => src}/sbuf.c              |   0
 slirp/{ => src}/slirp.c             |   9 -
 slirp/{ => src}/socket.c            |   0
 slirp/{ => src}/state.c             |  52 ++--
 slirp/src/stream.c                  | 119 +++++++++
 slirp/{ => src}/tcp_input.c         |   0
 slirp/{ => src}/tcp_output.c        |   0
 slirp/{ => src}/tcp_subr.c          |   0
 slirp/{ => src}/tcp_timer.c         |   0
 slirp/{ => src}/tftp.c              |   0
 slirp/{ => src}/udp.c               |   0
 slirp/{ => src}/udp6.c              |   0
 slirp/{ => src}/util.c              |   4 +-
 slirp/src/vmstate.c                 | 401 ++++++++++++++++++++++++++++
 util/main-loop.c                    |   2 -
 vl.c                                |   3 -
 Makefile                            |   8 +-
 Makefile.objs                       |   1 -
 Makefile.target                     |   5 +-
 configure                           |  65 ++++-
 net/Makefile.objs                   |   2 +
 slirp/Makefile                      |  47 ++++
 slirp/Makefile.objs                 |  34 ---
 util/Makefile.objs                  |   1 +
 71 files changed, 1162 insertions(+), 103 deletions(-)
 rename slirp/{ => src}/bootp.h (100%)
 rename slirp/{ => src}/debug.h (100%)
 rename slirp/{ => src}/dhcpv6.h (100%)
 rename slirp/{ => src}/if.h (100%)
 rename slirp/{ => src}/ip.h (100%)
 rename slirp/{ => src}/ip6.h (100%)
 rename slirp/{ => src}/ip6_icmp.h (100%)
 rename slirp/{ => src}/ip_icmp.h (100%)
 rename slirp/{ => src}/libslirp.h (93%)
 rename slirp/{ => src}/main.h (100%)
 rename slirp/{ => src}/mbuf.h (100%)
 rename slirp/{ => src}/misc.h (100%)
 rename slirp/{ => src}/ncsi-pkt.h (100%)
 rename slirp/{ => src}/qtailq.h (100%)
 rename slirp/{ => src}/sbuf.h (100%)
 rename slirp/{ => src}/slirp.h (100%)
 rename slirp/{ => src}/socket.h (100%)
 create mode 100644 slirp/src/state.h
 create mode 100644 slirp/src/stream.h
 rename slirp/{ => src}/tcp.h (100%)
 rename slirp/{ => src}/tcp_timer.h (100%)
 rename slirp/{ => src}/tcp_var.h (100%)
 rename slirp/{ => src}/tcpip.h (100%)
 rename slirp/{ => src}/tftp.h (100%)
 rename slirp/{ => src}/udp.h (100%)
 rename slirp/{ => src}/util.h (98%)
 create mode 100644 slirp/src/vmstate.h
 delete mode 100644 slirp/state.h
 rename slirp/{ => src}/arp_table.c (100%)
 rename slirp/{ => src}/bootp.c (100%)
 rename slirp/{ => src}/cksum.c (100%)
 rename slirp/{ => src}/dhcpv6.c (100%)
 rename slirp/{ => src}/dnssearch.c (100%)
 rename slirp/{ => src}/if.c (100%)
 rename slirp/{ => src}/ip6_icmp.c (100%)
 rename slirp/{ => src}/ip6_input.c (100%)
 rename slirp/{ => src}/ip6_output.c (100%)
 rename slirp/{ => src}/ip_icmp.c (100%)
 rename slirp/{ => src}/ip_input.c (100%)
 rename slirp/{ => src}/ip_output.c (100%)
 rename slirp/{ => src}/mbuf.c (100%)
 rename slirp/{ => src}/misc.c (100%)
 rename slirp/{ => src}/ncsi.c (100%)
 rename slirp/{ => src}/ndp_table.c (100%)
 rename slirp/{ => src}/sbuf.c (100%)
 rename slirp/{ => src}/slirp.c (99%)
 rename slirp/{ => src}/socket.c (100%)
 rename slirp/{ => src}/state.c (91%)
 create mode 100644 slirp/src/stream.c
 rename slirp/{ => src}/tcp_input.c (100%)
 rename slirp/{ => src}/tcp_output.c (100%)
 rename slirp/{ => src}/tcp_subr.c (100%)
 rename slirp/{ => src}/tcp_timer.c (100%)
 rename slirp/{ => src}/tftp.c (100%)
 rename slirp/{ => src}/udp.c (100%)
 rename slirp/{ => src}/udp6.c (100%)
 rename slirp/{ => src}/util.c (98%)
 create mode 100644 slirp/src/vmstate.c
 create mode 100644 slirp/Makefile
 delete mode 100644 slirp/Makefile.objs

-- 
2.21.0.rc0.1.g036caf7885