[Qemu-commits] [qemu/qemu] 893dcd: slirp, disas: Replace min/max with MIN/MAX macros

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 893dcdbfa9c345945e6b501ebbf7a0f78ad08180
      
https://github.com/qemu/qemu/commit/893dcdbfa9c345945e6b501ebbf7a0f78ad08180
  Author: Yuval Shaia <address@hidden>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M disas/m68k.c
    M slirp/dhcpv6.c
    M slirp/ip6_icmp.c
    M slirp/slirp.c
    M slirp/slirp.h
    M slirp/tcp_input.c
    M slirp/tcp_output.c
    M slirp/tcp_timer.c
    M slirp/tcpip.h

  Log Message:
  -----------
  slirp, disas: Replace min/max with MIN/MAX macros

Signed-off-by: Yuval Shaia <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 9443598d7e2f2c0a6493d97b3f11dd04837b08e8
      
https://github.com/qemu/qemu/commit/9443598d7e2f2c0a6493d97b3f11dd04837b08e8
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

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

  Log Message:
  -----------
  slirp: support dynamic block size for TFTP transfers

The blocksize option is defined in RFC 1783 and RFC 2348.
We now support block sizes between 1 and 1428 bytes, instead of 512 only.

Signed-off-by: Hervé Poussineau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 225adf16d2a128841d76e63248192797e05b712d
      
https://github.com/qemu/qemu/commit/225adf16d2a128841d76e63248192797e05b712d
  Author: Peter Maydell <address@hidden>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M disas/m68k.c
    M slirp/dhcpv6.c
    M slirp/ip6_icmp.c
    M slirp/slirp.c
    M slirp/slirp.h
    M slirp/tcp_input.c
    M slirp/tcp_output.c
    M slirp/tcp_timer.c
    M slirp/tcpip.h
    M slirp/tftp.c
    M slirp/tftp.h

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

slirp updates

# gpg: Signature made Tue 20 Dec 2016 23:05:13 GMT
# gpg:                using RSA key 0xA003196827414880
# 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 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: 6B0F AC21 8566 46E9 4AA2  D200 A003 1968 2741 4880

* remotes/thibault/tags/samuel-thibault:
  slirp: support dynamic block size for TFTP transfers
  slirp, disas: Replace min/max with MIN/MAX macros

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


Compare: https://github.com/qemu/qemu/compare/d1e8e8ecc3d2...225adf16d2a1