Message ID | 1303342742-16388-1-git-send-email-benjamin.poirier@gmail.com |
---|---|
State | New |
Headers | show |
On Thu, Apr 21, 2011 at 12:39 AM, Benjamin Poirier <benjamin.poirier@gmail.com> wrote: > 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> > --- > hw/rtl8139.c | 15 +++++++++------ > 1 files changed, 9 insertions(+), 6 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
On Wed, Apr 20, 2011 at 07:39:00PM -0400, Benjamin Poirier wrote: > 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> > --- > hw/rtl8139.c | 15 +++++++++------ > 1 files changed, 9 insertions(+), 6 deletions(-) Thanks, all applied. > diff --git a/hw/rtl8139.c b/hw/rtl8139.c > index d545933..9a759e7 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; > -- > 1.7.4.1 > > >
diff --git a/hw/rtl8139.c b/hw/rtl8139.c index d545933..9a759e7 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;
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> --- hw/rtl8139.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)