[Qemu-commits] [qemu/qemu] fdbfba: slirp: remove slirp_ prefix for socket wrappers

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fdbfba8cbf04b587f9bab11b8e6a87afc38556e5
      
https://github.com/qemu/qemu/commit/fdbfba8cbf04b587f9bab11b8e6a87afc38556e5
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-02-12 (Tue, 12 Feb 2019)

  Changed paths:
    M slirp/ip_icmp.c
    M slirp/misc.c
    M slirp/slirp.c
    M slirp/socket.c
    M slirp/tcp_subr.c
    M slirp/udp.c
    M slirp/util.h

  Log Message:
  -----------
  slirp: remove slirp_ prefix for socket wrappers

QEMU wraps the socket functions in os-win32.h, but in commit
a9d8b3ec4385793815d71217857304, the header inclusion was dropped,
breaking libslirp on Windows.

There are already a few socket functions that are wrapped in libslirp,
with "slirp_" prefix, but many of them are missing, and we are going
to wrap the missing functions in a second patch.

Using "slirp_" prefix avoids the conflict with socket function #define
wrappers in QEMU os-win32.h, but they are quite intrusive. In the end,
the functions should behave the same as original one, but with errno
being set. To avoid the churn, and potential confusion, remove the
"slirp_" prefix. A series of #undef is necessary until libslirp is
made standalone to prevent the #define conflict with QEMU.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: adf1add2927c7bb652a168f5be627102921cf35f
      
https://github.com/qemu/qemu/commit/adf1add2927c7bb652a168f5be627102921cf35f
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-02-12 (Tue, 12 Feb 2019)

  Changed paths:
    M slirp/util.c
    M slirp/util.h

  Log Message:
  -----------
  slirp: wrap the remaining socket functions

QEMU wraps the socket functions in os-win32.h, but in commit
a9d8b3ec4385793815d71217857304, the header inclusion was dropped,
breaking libslirp on Windows.

Wrap the missing functions.

Rename the wrapped function with "slirp_" prefix and "_wrap" suffix,
for consistency and to avoid a clash with existing function (such as
"slirp_socket").

Fixes: a9d8b3ec ("slirp: replace remaining qemu headers dependency")
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Tested-by: Howard Spoelstra


  Commit: 7e407466b1efbd65225cc72fe09c0c5ec79df75b
      
https://github.com/qemu/qemu/commit/7e407466b1efbd65225cc72fe09c0c5ec79df75b
  Author: Peter Maydell <address@hidden>
  Date:   2019-02-14 (Thu, 14 Feb 2019)

  Changed paths:
    M slirp/ip_icmp.c
    M slirp/misc.c
    M slirp/slirp.c
    M slirp/socket.c
    M slirp/tcp_subr.c
    M slirp/udp.c
    M slirp/util.c
    M slirp/util.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into 
staging

Fix slirp on windows

Marc-André Lureau (2):
  slirp: remove slirp_ prefix for socket wrappers
  slirp: wrap the remaining socket functions

# gpg: Signature made Wed 13 Feb 2019 18:31:21 GMT
# gpg:                using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <address@hidden>" [unknown]
# gpg:                 aka "Samuel Thibault <address@hidden>" [marginal]
# gpg:                 aka "Samuel Thibault <address@hidden>" [unknown]
# gpg:                 aka "Samuel Thibault <address@hidden>" [marginal]
# gpg:                 aka "Samuel Thibault <address@hidden>" [marginal]
# gpg:                 aka "Samuel Thibault <address@hidden>" [marginal]
# gpg:                 aka "Samuel Thibault <address@hidden>" [unknown]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: E61D BB15 D417 2BDE C97E  92D9 DB55 0E89 F0FA 54F3

* remotes/thibault/tags/samuel-thibault:
  slirp: wrap the remaining socket functions
  slirp: remove slirp_ prefix for socket wrappers

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/c4c5f6573a93...7e407466b1ef