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

bswap.h: Remove cpu_to_be32wu() 



Replace the legacy cpu_to_be32wu() with stl_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-8-git-send-email-peter.maydell@linaro.org
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parent d8ee2591

hw/block/cdrom.c

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

        } else {

            /* sector 0 */

            cpu_to_be32wu((uint32_t *)q, 0);

            stl_be_p(q, 0);

            q += 4;

        }

    }
@@ -73,7 +73,7 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track) 
        lba_to_msf(q, nb_sectors);

        q += 3;

    } else {

        cpu_to_be32wu((uint32_t *)q, nb_sectors);

        stl_be_p(q, nb_sectors);

        q += 4;

    }

    len = q - buf;
@@ -127,7 +127,7 @@ int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num) 
        lba_to_msf(q, nb_sectors);

        q += 3;

    } else {

        cpu_to_be32wu((uint32_t *)q, nb_sectors);

        stl_be_p(q, nb_sectors);

        q += 4;

    }

hw/net/e1000.c

+1 −2
Original line number Diff line number Diff line
@@ -599,8 +599,7 @@ xmit_seg(E1000State *s) 
        DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", tp->tcp, css, len);

        if (tp->tcp) {

            sofar = frames * tp->mss;

            cpu_to_be32wu((uint32_t *)(tp->data+css+4),	// seq

                ldl_be_p(tp->data+css+4)+sofar);

            stl_be_p(tp->data+css+4, ldl_be_p(tp->data+css+4)+sofar); /* seq */

            if (tp->paylen - sofar > tp->mss)

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

        } else	// UDP

hw/pci/pcie_aer.c

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static void pcie_aer_update_log(PCIDevice *dev, const PCIEAERErr *err) 
            /* 7.10.8 Header Log Register */

            uint8_t *header_log =

                aer_cap + PCI_ERR_HEADER_LOG + i * sizeof err->header[0];

            cpu_to_be32wu((uint32_t*)header_log, err->header[i]);

            stl_be_p(header_log, err->header[i]);

        }

    } else {

        assert(!(err->flags & PCIE_AER_ERR_TLP_PREFIX_PRESENT));
@@ -439,7 +439,7 @@ static void pcie_aer_update_log(PCIDevice *dev, const PCIEAERErr *err) 
            /* 7.10.12 tlp prefix log register */

            uint8_t *prefix_log =

                aer_cap + PCI_ERR_TLP_PREFIX_LOG + i * sizeof err->prefix[0];

            cpu_to_be32wu((uint32_t*)prefix_log, err->prefix[i]);

            stl_be_p(prefix_log, err->prefix[i]);

        }

        errcap |= PCI_ERR_CAP_TLP;

    } else {

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_be32wu(uint32_t *p, uint32_t v)

{

    stl_be_p(p, v);

}



static inline void cpu_to_be64wu(uint64_t *p, uint64_t v)

{

    stq_be_p(p, v);