Commit d8ee2591 authored by Peter Maydell's avatar Peter Maydell Committed by Anthony Liguori
Browse files

bswap.h: Remove cpu_to_be16wu() 



Replace the legacy cpu_to_be16wu() with stw_be_p().

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-id: 1383669517-25598-7-git-send-email-peter.maydell@linaro.org
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parent 09fa8439

hw/block/cdrom.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track) 
        q += 4;

    }

    len = q - buf;

    cpu_to_be16wu((uint16_t *)buf, len - 2);

    stw_be_p(buf, len - 2);

    return len;

}
@@ -150,6 +150,6 @@ int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num) 
    }



    len = q - buf;

    cpu_to_be16wu((uint16_t *)buf, len - 2);

    stw_be_p(buf, len - 2);

    return len;

}

hw/ide/atapi.c

+8 −8
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static int ide_dvd_read_structure(IDEState *s, int format, 
                cpu_to_ube32(buf + 16, total_sectors - 1); /* l0 end sector */



                /* Size of buffer, not including 2 byte size field */

                cpu_to_be16wu((uint16_t *)buf, 2048 + 2);

                stw_be_p(buf, 2048 + 2);



                /* 2k data + 4 byte header */

                return (2048 + 4);
@@ -448,7 +448,7 @@ static int ide_dvd_read_structure(IDEState *s, int format, 
            buf[5] = 0; /* no region restrictions */



            /* Size of buffer, not including 2 byte size field */

            cpu_to_be16wu((uint16_t *)buf, 4 + 2);

            stw_be_p(buf, 4 + 2);



            /* 4 byte header + 4 byte data */

            return (4 + 4);
@@ -458,7 +458,7 @@ static int ide_dvd_read_structure(IDEState *s, int format, 


        case 0x04: /* DVD disc manufacturing information */

            /* Size of buffer, not including 2 byte size field */

            cpu_to_be16wu((uint16_t *)buf, 2048 + 2);

            stw_be_p(buf, 2048 + 2);



            /* 2k data + 4 byte header */

            return (2048 + 4);
@@ -471,22 +471,22 @@ static int ide_dvd_read_structure(IDEState *s, int format, 


            buf[4] = 0x00; /* Physical format */

            buf[5] = 0x40; /* Not writable, is readable */

            cpu_to_be16wu((uint16_t *)(buf + 6), 2048 + 4);

            stw_be_p(buf + 6, 2048 + 4);



            buf[8] = 0x01; /* Copyright info */

            buf[9] = 0x40; /* Not writable, is readable */

            cpu_to_be16wu((uint16_t *)(buf + 10), 4 + 4);

            stw_be_p(buf + 10, 4 + 4);



            buf[12] = 0x03; /* BCA info */

            buf[13] = 0x40; /* Not writable, is readable */

            cpu_to_be16wu((uint16_t *)(buf + 14), 188 + 4);

            stw_be_p(buf + 14, 188 + 4);



            buf[16] = 0x04; /* Manufacturing info */

            buf[17] = 0x40; /* Not writable, is readable */

            cpu_to_be16wu((uint16_t *)(buf + 18), 2048 + 4);

            stw_be_p(buf + 18, 2048 + 4);



            /* Size of buffer, not including 2 byte size field */

            cpu_to_be16wu((uint16_t *)buf, 16 + 2);

            stw_be_p(buf, 16 + 2);



            /* data written + 4 byte header */

            return (16 + 4);

hw/net/e1000.c

+8 −11
Original line number Diff line number Diff line
@@ -528,8 +528,7 @@ putsum(uint8_t *data, uint32_t n, uint32_t sloc, uint32_t css, uint32_t cse) 
        n = cse + 1;

    if (sloc < n-1) {

        sum = net_checksum_add(n-css, data+css);

        cpu_to_be16wu((uint16_t *)(data + sloc),

                      net_checksum_finish(sum));

        stw_be_p(data + sloc, net_checksum_finish(sum));

    }

}
@@ -590,13 +589,11 @@ xmit_seg(E1000State *s) 
        DBGOUT(TXSUM, "frames %d size %d ipcss %d\n",

               frames, tp->size, css);

        if (tp->ip) {		// IPv4

            cpu_to_be16wu((uint16_t *)(tp->data+css+2),

                          tp->size - css);

            cpu_to_be16wu((uint16_t *)(tp->data+css+4),

            stw_be_p(tp->data+css+2, tp->size - css);

            stw_be_p(tp->data+css+4,

                          be16_to_cpup((uint16_t *)(tp->data+css+4))+frames);

        } else			// IPv6

            cpu_to_be16wu((uint16_t *)(tp->data+css+4),

                          tp->size - css);

            stw_be_p(tp->data+css+4, tp->size - css);

        css = tp->tucss;

        len = tp->size - css;

        DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", tp->tcp, css, len);
@@ -607,14 +604,14 @@ xmit_seg(E1000State *s) 
            if (tp->paylen - sofar > tp->mss)

                tp->data[css + 13] &= ~9;		// PSH, FIN

        } else	// UDP

            cpu_to_be16wu((uint16_t *)(tp->data+css+4), len);

            stw_be_p(tp->data+css+4, len);

        if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {

            unsigned int phsum;

            // add pseudo-header length before checksum calculation

            sp = (uint16_t *)(tp->data + tp->tucso);

            phsum = be16_to_cpup(sp) + len;

            phsum = (phsum >> 16) + (phsum & 0xffff);

            cpu_to_be16wu(sp, phsum);

            stw_be_p(sp, phsum);

        }

        tp->tso_frames++;

    }
@@ -684,9 +681,9 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) 
    if (vlan_enabled(s) && is_vlan_txd(txd_lower) &&

        (tp->cptse || txd_lower & E1000_TXD_CMD_EOP)) {

        tp->vlan_needed = 1;

        cpu_to_be16wu((uint16_t *)(tp->vlan_header),

        stw_be_p(tp->vlan_header,

                      le16_to_cpup((uint16_t *)(s->mac_reg + VET)));

        cpu_to_be16wu((uint16_t *)(tp->vlan_header + 2),

        stw_be_p(tp->vlan_header + 2,

                      le16_to_cpu(dp->upper.fields.special));

    }

include/qemu/bswap.h

+0 −5
Original line number Diff line number Diff line
@@ -412,11 +412,6 @@ static inline void stfq_be_p(void *ptr, float64 v) 


/* Legacy unaligned versions.  Note that we never had a complete set.  */



static inline void cpu_to_be16wu(uint16_t *p, uint16_t v)

{

    stw_be_p(p, v);

}



static inline void cpu_to_be32wu(uint32_t *p, uint32_t v)

{

    stl_be_p(p, v);