From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 8 Mar 2019 11:55:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
X-Git-Tag: qemu-xen-4.13.0-rc1~328
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6bbbe16a02ecf631fffb4a339e1c662d60a1e529;p=qemu-xen.git

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

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

# gpg: Signature made Thu 07 Mar 2019 11:51:20 GMT
# gpg:                using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
# gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [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: remove QEMU Makefile.objs
  build-sys: link with slirp as an external project
  slirp: add a standalone Makefile
  slirp: move sources to src/ subdirectory
  slirp: use "slirp_" prefix for inet_aton() win32 implementation
  slirp: use libslirp migration code
  slirp: adapt a subset of QEMU vmstate code
  slirp: Mark pieces missing IPv6 support
  slirp: fix big/little endian conversion in ident protocol
  slirp: check sscanf result when emulating ident
  slirp: check for ioctlsocket error and 0-length udp payload.
  slirp: Fix build with gcc 9

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

6bbbe16a02ecf631fffb4a339e1c662d60a1e529
diff --cc Makefile.target
index ec72733ace,bd773da756..40830c5646
--- a/Makefile.target
+++ b/Makefile.target
@@@ -202,11 -197,8 +200,10 @@@ all-obj-$(CONFIG_SOFTMMU) += $(block-ob
  all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y)
  all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y)
  all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)
- all-obj-$(CONFIG_SOFTMMU) += $(slirp-obj-y)
  
 +ifdef CONFIG_SOFTMMU
  $(QEMU_PROG_BUILD): config-devices.mak
 +endif
  
  COMMON_LDADDS = ../libqemuutil.a