[Qemu-commits] [qemu/qemu] 51149a: slirp: fix compilation errors with DEBUG set

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 51149a2ac1ed962e04c48fe591f2b6b288755af6
      
https://github.com/qemu/qemu/commit/51149a2ac1ed962e04c48fe591f2b6b288755af6
  Author: Laurent Vivier <address@hidden>
  Date:   2017-03-29 (Wed, 29 Mar 2017)

  Changed paths:
    M slirp/slirp.c

  Log Message:
  -----------
  slirp: fix compilation errors with DEBUG set

slirp/slirp.c: In function 'get_dns_addr_resolv_conf':
slirp/slirp.c:202:29: error: initialization discards 'const' qualifier from 
pointer target type [-Werror=discarded-qualifiers]
           char *res = inet_ntop(af, tmp_addr, s, sizeof(s));
                       ^~~~~~~~~
slirp/slirp.c:204:25: error: assignment discards 'const' qualifier from pointer 
target type [-Werror=discarded-qualifiers]
               res = "(string conversion error)";

Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: e42f869b5118fa9ac64dcea624276204567fc581
      
https://github.com/qemu/qemu/commit/e42f869b5118fa9ac64dcea624276204567fc581
  Author: Samuel Thibault <address@hidden>
  Date:   2017-03-29 (Wed, 29 Mar 2017)

  Changed paths:
    M slirp/ip6_icmp.c

  Log Message:
  -----------
  slirp: Make RA build more flexible

Do not hardcode the RA size at all, use a pl_size variable which
accounts the accumulated size, and fill rip->ip_pl at the end.

This will allow to make some blocks optional.

Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: a2f80fdfc683019901cdf4c0863a5920c0ca7245
      
https://github.com/qemu/qemu/commit/a2f80fdfc683019901cdf4c0863a5920c0ca7245
  Author: Samuel Thibault <address@hidden>
  Date:   2017-03-29 (Wed, 29 Mar 2017)

  Changed paths:
    M slirp/ip6_icmp.c

  Log Message:
  -----------
  slirp: Send RDNSS in RA only if host has an IPv6 DNS server

Previously we would always send an RDNSS option in the RA, making the guest
try to resolve DNS through IPv6, even if the host does not actually have
and IPv6 DNS server available.

This makes the RDNSS option enabled only when an IPv6 DNS server is
available.

Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: e839001d5bb6c84932e2d82bd383477b2023f407
      
https://github.com/qemu/qemu/commit/e839001d5bb6c84932e2d82bd383477b2023f407
  Author: Peter Maydell <address@hidden>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M slirp/ip6_icmp.c
    M slirp/slirp.c

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

slirp updates

# gpg: Signature made Tue 28 Mar 2017 23:51:51 BST
# gpg:                using RSA key 0xB0A51BF58C9179C5
# gpg: Good signature from "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# 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: AEBF 7448 FAB9 453A 4552  390E B0A5 1BF5 8C91 79C5

* remotes/thibault/tags/samuel-thibault:
  slirp: Send RDNSS in RA only if host has an IPv6 DNS server
  slirp: Make RA build more flexible
  slirp: fix compilation errors with DEBUG set

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


Compare: https://github.com/qemu/qemu/compare/a67ec6ee2dbb...e839001d5bb6