mbox

[PULLv2,00/12] slirp updates

Message ID 20190307115143.780-1-samuel.thibault@ens-lyon.org
State New
Headers show

Pull-request

https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault

Message

Samuel Thibault March 7, 2019, 11:51 a.m. UTC 
The following changes since commit 32694e98b8d7a246345448a8f707d2e11d6c65e2:

  Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-06 18:52:19 +0000)

are available in the Git repository at:

  https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault

for you to fetch changes up to be1911ff7504be95d5cf2c18bc99ce07246a91e5:

  slirp: remove QEMU Makefile.objs (2019-03-07 12:46:31 +0100)

----------------------------------------------------------------
Slirp updates

Greg Kurz (1):
  slirp: Fix build with gcc 9

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

Samuel Thibault (2):
  slirp: fix big/little endian conversion in ident protocol
  slirp: Mark pieces missing IPv6 support

Vic Lee (1):
  slirp: check for ioctlsocket error and 0-length udp payload.

William Bowling (1):
  slirp: check sscanf result when emulating ident

----------------------------------------------------------------
Greg Kurz (1):
      slirp: Fix build with gcc 9

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

Samuel Thibault (2):
      slirp: fix big/little endian conversion in ident protocol
      slirp: Mark pieces missing IPv6 support

Vic Lee (1):
      slirp: check for ioctlsocket error and 0-length udp payload.

William Bowling (1):
      slirp: check sscanf result when emulating ident

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

Comments

Peter Maydell March 8, 2019, 12:44 p.m. UTC | #1 
On Thu, 7 Mar 2019 at 11:51, Samuel Thibault
<samuel.thibault@ens-lyon.org> wrote:
>
> The following changes since commit 32694e98b8d7a246345448a8f707d2e11d6c65e2:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-06 18:52:19 +0000)
>
> are available in the Git repository at:
>
>   https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
>
> for you to fetch changes up to be1911ff7504be95d5cf2c18bc99ce07246a91e5:
>
>   slirp: remove QEMU Makefile.objs (2019-03-07 12:46:31 +0100)
>
> ----------------------------------------------------------------

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.

-- PMM