diff options
| author | Benjamin Poirier <benjamin.poirier@gmail.com> | 2011-04-20 19:39:00 -0400 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-04-25 22:17:47 +0200 |
| commit | afcd9c0dcd1d6ab14a72db6abde76142c6a0ac12 (patch) | |
| tree | d204285b065a8a3aaa278cced6d7856296b77d47 | |
| parent | 7cb4db8f41d20d2c9d9c9a6830a362eebaeb42ed (diff) | |
| download | focaccia-qemu-afcd9c0dcd1d6ab14a72db6abde76142c6a0ac12.tar.gz focaccia-qemu-afcd9c0dcd1d6ab14a72db6abde76142c6a0ac12.zip | |
rtl8139: use TARGET_FMT_plx in debug messages
Prevents a compilation failure when DEBUG_RTL8139 is defined: CC libhw32/rtl8139.o cc1: warnings being treated as errors hw/rtl8139.c: In function ‘rtl8139_cplus_transmit_one’: hw/rtl8139.c:1960: error: format ‘%8lx’ expects type ‘long unsigned int’, but argument 5 has type ‘target_phys_addr_t’ make[1]: *** [rtl8139.o] Error 1 Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com> Cc: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | hw/rtl8139.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/rtl8139.c b/hw/rtl8139.c index 8790a00afb..a46416ef77 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -978,8 +978,9 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_ cplus_rx_ring_desc = rtl8139_addr64(s->RxRingAddrLO, s->RxRingAddrHI); cplus_rx_ring_desc += 16 * descriptor; - DEBUG_PRINT(("RTL8139: +++ C+ mode reading RX descriptor %d from host memory at %08x %08x = %016" PRIx64 "\n", - descriptor, s->RxRingAddrHI, s->RxRingAddrLO, (uint64_t)cplus_rx_ring_desc)); + DEBUG_PRINT(("RTL8139: +++ C+ mode reading RX descriptor %d from " + "host memory at %08x %08x = " TARGET_FMT_plx "\n", descriptor, + s->RxRingAddrHI, s->RxRingAddrLO, cplus_rx_ring_desc)); uint32_t val, rxdw0,rxdw1,rxbufLO,rxbufHI; @@ -1957,8 +1958,9 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) /* Normal priority ring */ cplus_tx_ring_desc += 16 * descriptor; - DEBUG_PRINT(("RTL8139: +++ C+ mode reading TX descriptor %d from host memory at %08x0x%08x = 0x%8lx\n", - descriptor, s->TxAddr[1], s->TxAddr[0], cplus_tx_ring_desc)); + DEBUG_PRINT(("RTL8139: +++ C+ mode reading TX descriptor %d from host " + "memory at %08x0x%08x = 0x" TARGET_FMT_plx "\n", descriptor, + s->TxAddr[1], s->TxAddr[0], cplus_tx_ring_desc)); uint32_t val, txdw0,txdw1,txbufLO,txbufHI; @@ -2069,8 +2071,9 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) /* append more data to the packet */ - DEBUG_PRINT(("RTL8139: +++ C+ mode transmit reading %d bytes from host memory at %016" PRIx64 " to offset %d\n", - txsize, (uint64_t)tx_addr, s->cplus_txbuffer_offset)); + DEBUG_PRINT(("RTL8139: +++ C+ mode transmit reading %d bytes from host " + "memory at " TARGET_FMT_plx " to offset %d\n", txsize, tx_addr, + s->cplus_txbuffer_offset)); cpu_physical_memory_read(tx_addr, s->cplus_txbuffer + s->cplus_txbuffer_offset, txsize); s->cplus_txbuffer_offset += txsize; |