Slirp updates

Daniel P. Berrangé (1):
   configure: remove slirp submodule support that doesn't exist yet
 
 Marc-André Lureau (1):
   slirp: remove empty state.h
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE5h27FdQXK97JfpLZ21UOifD6VPMFAlyJc6sACgkQ21UOifD6
 VPOQ+g//d4rOjJMBimAdx22ycB4Y7pNRgKOJMxG9vzqKOZstY2kDDnk1+fMOI+M6
 RsUx0WT1oVkMZGbwFFLPT90JgMnrivEaoIiu4ozis1ik2W620ReD3itP5IbohQdi
 vFY7oLLtAuCs7aF+FnWRpMsMrC6KUGq3lZuP1ZqJwVt6hTrcSOvTOxKfWmHVqRCl
 ZpxsWlANGlJzOW0EWSeP+LncqRWLLTspSVBo/nQEkdZvdAnPW39rl4kuqpjYjWap
 2sS2PSxkuBCH+4XjQH2giPOeZCq7a91nF9VwhTEC9smNES18/h1uKvrg01/2nrVl
 fdeKTa3Ct5fWH+rmLEMHoUx+BGlAkaX+A4TSIa05JqUK6DWE80wCy0rU0qKpIDxf
 RUXo7G1UBmp0It45960ZUG3OpoNERoXxvdlxfInMu3WyMpInThaeiZZx9m2Q2a8M
 j8k76iz/1QF9ljS95RdrRZkDmzTHxIfUJMr2vj4qpP1X0CStMFYWZYHj67pa4MhM
 8hCUWmW/fgz5PgJ8ECwSAwaX2SC3DIru2AJv3Ps9pF9WiRnGWWw+4edsyJRWO0dK
 Pr8Kpzqijp6/bDvfVbWRtCNTPfC7jq8ZL6ibGlFzr0/P/WyWjIU+RGTX7EXncBb9
 2egrB0/cBhs/XH8b2yc/K9KyjSHz9EWyXnc93NEQw1gkiNPo1Aw=
 =UTTv
 -----END PGP SIGNATURE-----

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

Slirp updates

Daniel P. Berrangé (1):
  configure: remove slirp submodule support that doesn't exist yet

Marc-André Lureau (1):
  slirp: remove empty state.h

# gpg: Signature made Wed 13 Mar 2019 21:18:35 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:
  configure: remove slirp submodule support that doesn't exist yet
  slirp: remove empty state.h

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

configure

@@ -1111,8 +1111,6 @@ for opt do
   ;;
   --disable-slirp) slirp="no"
   ;;
-  --enable-slirp=git) slirp="git"
-  ;;
   --enable-slirp=system) slirp="system"
   ;;
   --disable-vde) vde="no"
@@ -5866,8 +5864,6 @@ case "$slirp" in
   "" | yes)
     if $pkg_config slirp; then
       slirp=system
-    elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then
-      slirp=git
     elif test -e "${source_path}/slirp/Makefile" ; then
       slirp=internal
     elif test -z "$slirp" ; then
@@ -5885,10 +5881,7 @@ case "$slirp" in
 esac
 
 case "$slirp" in
-  git | internal)
-    if test "$slirp" = git; then
-      git_submodules="${git_submodules} slirp"
-    fi
+  internal)
     mkdir -p slirp
     slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src"
     slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp"
@@ -6551,7 +6544,7 @@ if test "$slirp" != "no"; then
   echo "SLIRP_CFLAGS=$slirp_cflags" >> $config_host_mak
   echo "SLIRP_LIBS=$slirp_libs" >> $config_host_mak
 fi
-if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then
+if [ "$slirp" = "internal" ]; then
     echo "config-host.h: subdir-slirp" >> $config_host_mak
 fi
 if test "$vde" = "yes" ; then

slirp/src/state.c

@@ -23,7 +23,6 @@
  */
 #include "slirp.h"
 #include "vmstate.h"
-#include "state.h"
 #include "stream.h"
 
 static int slirp_tcp_post_load(void *opaque, int version)