[Qemu-commits] [qemu/qemu] cebee2: slirp: Clean up slirp_config.h

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: cebee21aca9ffef0248b6b6e37c4c152358241a3
      
https://github.com/qemu/qemu/commit/cebee21aca9ffef0248b6b6e37c4c152358241a3
  Author: Thomas Huth <address@hidden>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M slirp/slirp_config.h

  Log Message:
  -----------
  slirp: Clean up slirp_config.h

There are a lot of unused #defines / #undefs in slirp_config.h,
which are apparently left-overs from the very early slirp code.
Since there is no more code that uses them, let's simply remove
them from our version of slirp.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 5469feadb1dafc663ed5b978dc9a5ff0b1b69a6e
      
https://github.com/qemu/qemu/commit/5469feadb1dafc663ed5b978dc9a5ff0b1b69a6e
  Author: Thomas Huth <address@hidden>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M slirp/misc.c
    M slirp/slirp.h
    M slirp/slirp_config.h

  Log Message:
  -----------
  slirp: Remove obsolete backward-compatibility cruft

The slirp code does not use index() and gethostid() anymore,
so these parts can be removed without problems.
memmove() and strerror() should be available on each of the
supported platforms nowadays, too, so these wrappers are also
not needed anymore.
And we certainly also do not support Ultrix anymore, so no
need to keep the code for this platform anymore.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 2cdc848eb5bd7caf467942aee63f813f52db4e40
      
https://github.com/qemu/qemu/commit/2cdc848eb5bd7caf467942aee63f813f52db4e40
  Author: Thomas Huth <address@hidden>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M slirp/slirp.h

  Log Message:
  -----------
  slirp: Remove some unused code from slirp.h

These hunks are apparently not used anymore, so let's delete them.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 9892663dc486755b5534ff8a77913edc5ea28c79
      
https://github.com/qemu/qemu/commit/9892663dc486755b5534ff8a77913edc5ea28c79
  Author: Thomas Huth <address@hidden>
  Date:   2016-05-16 (Mon, 16 May 2016)

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

  Log Message:
  -----------
  slirp: Clean up osdep.h related header inclusions

qemu/osdep.h is included in some headers twice - one time
should be sufficient.
Also remove the inclusion of time.h since that is already
done by osdep.h, too (this makes scripts/clean-includes
happy again).

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: de3e15a705cbb4b54b2a749f8d5131c9f1666fb3
      
https://github.com/qemu/qemu/commit/de3e15a705cbb4b54b2a749f8d5131c9f1666fb3
  Author: Changlong Xie <address@hidden>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M util/rfifolock.c

  Log Message:
  -----------
  rfifolock: no need to get thread identifier when nesting

Signed-off-by: Changlong Xie <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: c98e7937119503d06dbb494b7e4806ec66a27df0
      
https://github.com/qemu/qemu/commit/c98e7937119503d06dbb494b7e4806ec66a27df0
  Author: Peter Maydell <address@hidden>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M slirp/ip6_icmp.c
    M slirp/ip_input.c
    M slirp/misc.c
    M slirp/slirp.h
    M slirp/slirp_config.h
    M slirp/udp6.c

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

slirp updates

# gpg: Signature made Mon 16 May 2016 20:22:36 BST using RSA key ID FB6B2F1D
# 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: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: F632 74CD C630 0873 CB3D  29D9 E3E5 1CE8 FB6B 2F1D

* remotes/thibault/tags/samuel-thibault:
  slirp: Clean up osdep.h related header inclusions
  slirp: Remove some unused code from slirp.h
  slirp: Remove obsolete backward-compatibility cruft
  slirp: Clean up slirp_config.h

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


  Commit: 3f5e34a45c78086b73ec4e1a0268ec26169fee80
      
https://github.com/qemu/qemu/commit/3f5e34a45c78086b73ec4e1a0268ec26169fee80
  Author: Peter Maydell <address@hidden>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M util/rfifolock.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into 
staging

# gpg: Signature made Tue 17 May 2016 01:19:39 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request:
  rfifolock: no need to get thread identifier when nesting

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


Compare: https://github.com/qemu/qemu/compare/70f87e0f0aa0...3f5e34a45c78