From: Thomas Huth Date: Thu, 16 Nov 2017 21:16:54 +0000 (+0100) Subject: hw/net/eepro100: Fix endianness problem on big endian hosts X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8f8e8053d9cc9f64f739ad64fa6ac83a4d9555f6;p=qemu.git hw/net/eepro100: Fix endianness problem on big endian hosts Since commit 1865e288a823c764cd4344d ("Fix eepro100 simple transmission mode"), the test/pxe-test is broken for the eepro100 device on big endian hosts. However, it seems like that commit did not introduce the problem, but just uncovered it: The EEPRO100State->tx.tbd_array_addr and EEPRO100State->tx.tcb_bytes fields are already in host byte order, since they have already been byte-swapped in the read_cb() function. Thus byte-swapping them in tx_command() again results in the wrong endianness. Removing the byte-swapping here fixes the pxe-test. Signed-off-by: Thomas Huth Signed-off-by: Jason Wang --- diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 91dd058010..1c0def555b 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -754,8 +754,8 @@ static void read_cb(EEPRO100State *s) static void tx_command(EEPRO100State *s) { - uint32_t tbd_array = le32_to_cpu(s->tx.tbd_array_addr); - uint16_t tcb_bytes = (le16_to_cpu(s->tx.tcb_bytes) & 0x3fff); + uint32_t tbd_array = s->tx.tbd_array_addr; + uint16_t tcb_bytes = s->tx.tcb_bytes & 0x3fff; /* Sends larger than MAX_ETH_FRAME_SIZE are allowed, up to 2600 bytes. */ uint8_t buf[2600]; uint16_t size = 0;