Commit 225adf16 authored by Peter Maydell's avatar Peter Maydell
Browse files

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 <samuel.thibault@gnu.org>"
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# 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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d1e8e8ec 9443598d

disas/m68k.c

+2 −6
Original line number Diff line number Diff line
@@ -4698,10 +4698,6 @@ get_field (const unsigned char *data, enum floatformat_byteorders order, 
  return result;

}



#ifndef min

#define min(a, b) ((a) < (b) ? (a) : (b))

#endif



/* Convert from FMT to a double.

   FROM is the address of the extended float.

   Store the double in *TO.  */
@@ -4733,7 +4729,7 @@ floatformat_to_double (const struct floatformat *fmt, 
      nan = 0;

      while (mant_bits_left > 0)

	{

	  mant_bits = min (mant_bits_left, 32);

          mant_bits = MIN(mant_bits_left, 32);



	  if (get_field (ufrom, fmt->byteorder, fmt->totalsize,

			 mant_off, mant_bits) != 0)
@@ -4793,7 +4789,7 @@ floatformat_to_double (const struct floatformat *fmt, 


  while (mant_bits_left > 0)

    {

      mant_bits = min (mant_bits_left, 32);

      mant_bits = MIN(mant_bits_left, 32);



      mant = get_field (ufrom, fmt->byteorder, fmt->totalsize,

			 mant_off, mant_bits);

slirp/dhcpv6.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void dhcpv6_info_request(Slirp *slirp, struct sockaddr_in6 *srcsas, 
                        sa[0], sa[1], sa[2], sa[3], sa[4], sa[5], sa[6], sa[7],

                        sa[8], sa[9], sa[10], sa[11], sa[12], sa[13], sa[14],

                        sa[15], slirp->bootp_filename);

        slen = min(slen, smaxlen);

        slen = MIN(slen, smaxlen);

        *resp++ = slen >> 8;                    /* option-len high byte */

        *resp++ = slen;                         /* option-len low byte */

        resp += slen;

slirp/ip6_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void icmp6_send_error(struct mbuf *m, uint8_t type, uint8_t code) 
#endif



    rip->ip_nh = IPPROTO_ICMPV6;

    const int error_data_len = min(m->m_len,

    const int error_data_len = MIN(m->m_len,

            IF_MTU - (sizeof(struct ip6) + ICMP6_ERROR_MINLEN));

    rip->ip_pl = htons(ICMP6_ERROR_MINLEN + error_data_len);

    t->m_len = sizeof(struct ip6) + ntohs(rip->ip_pl);

slirp/slirp.c

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error) 
static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)

{

    struct slirp_arphdr *ah = (struct slirp_arphdr *)(pkt + ETH_HLEN);

    uint8_t arp_reply[max(ETH_HLEN + sizeof(struct slirp_arphdr), 64)];

    uint8_t arp_reply[MAX(ETH_HLEN + sizeof(struct slirp_arphdr), 64)];

    struct ethhdr *reh = (struct ethhdr *)arp_reply;

    struct slirp_arphdr *rah = (struct slirp_arphdr *)(arp_reply + ETH_HLEN);

    int ar_op;

slirp/slirp.h

+0 −5
Original line number Diff line number Diff line
@@ -292,9 +292,4 @@ int tcp_emu(struct socket *, struct mbuf *); 
int tcp_ctl(struct socket *);

struct tcpcb *tcp_drop(struct tcpcb *tp, int err);



#ifndef _WIN32

#define min(x,y) ((x) < (y) ? (x) : (y))

#define max(x,y) ((x) > (y) ? (x) : (y))

#endif



#endif