net: cadence_gem: fix compilation error when debug is on
PATCH 1/1 net: cadence_gem: fix compilation error when debug is on
defining CADENCE_GEM_ERR_DEBUG causes compilation
errors, fix that.
--- hw/net/cadence_gem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/net/cadence_gem.c +3 -3
@@ -982,8 +982,8 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)return -1 ; } -DB_PRINT ("copy %d bytes to 0x%x\n" ,MIN (bytes_to_copy, rxbufsize), -rx_desc_get_buffer (s->rx_desc[q])); +DB_PRINT ("copy %d bytes to 0x%lx\n" ,MIN (bytes_to_copy, rxbufsize), +rx_desc_get_buffer (s, s->rx_desc[q]));/* Copy packet data to emulated DMA buffer */ address_space_write(&s->dma_as, rx_desc_get_buffer(s, s->rx_desc[q]) +
@@ -1156,7 +1156,7 @@ static void gem_transmit(CadenceGEMState *s)if (tx_desc_get_length (desc) >sizeof (tx_packet) - (p - tx_packet)) {DB_PRINT ("TX descriptor @ 0x%x too large: size 0x%x space " \ -"0x%x\n" , (unsigned )packet_desc_addr, +"0x%lx\n" , (unsigned )packet_desc_addr, (unsigned )tx_desc_get_length (desc),sizeof (tx_packet) - (p - tx_packet));break ;
Signature · 1 line
2.21.0
Hi Ramon,
Quoted 13 lines · Ramon Fried
defining
CADENCE_GEM_ERR_DEBUGcauses compilation
errors, fix that.Signed-off-by Ramon Fried <[email protected]>--- hw/net/cadence_gem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/net/cadence_gem.c +0
-0
hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size) · line 986
Quoted 7 lines
hw/net/cadence_gem.c +2
-2@@ -982,8 +982,8 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)return -1 ; } -DB_PRINT ("copy %d bytes to 0x%x\n" ,MIN (bytes_to_copy, rxbufsize), -rx_desc_get_buffer (s->rx_desc[q])); +DB_PRINT ("copy %d bytes to 0x%lx\n" ,MIN (bytes_to_copy, rxbufsize), +rx_desc_get_buffer (s, s->rx_desc[q]));
Your patch fails on 32-bit hosts:
./hw/net/cadence_gem.c:987:18: error: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=]
DB_PRINT("copy %d bytes to 0x%lx\n", MIN(bytes_to_copy, rxbufsize),
^
./hw/net/cadence_gem.c:39:24: note: in definition of macro 'DB_PRINT'
fprintf(stderr, ## __VA_ARGS__); \
^./hw/net/cadence_gem.c: In function 'gem_transmit':./hw/net/cadence_gem.c:1160:26: error: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'unsigned int' [-Werror=format=]
DB_PRINT("TX descriptor @ 0x%x too large: size 0x%x
space " \
^
./hw/net/cadence_gem.c:39:24: note: in definition of macro 'DB_PRINT'
fprintf(stderr, ## __VA_ARGS__); \
^cc1: all warnings being treated as errors
QEMU provides "HWADDR_PRIx" format for addresses, see for example few lines earlier:
DB_PRINT("read descriptor 0x%" HWADDR_PRIx "\n", packet_desc_addr);hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1159
Quoted 9 lines
hw/net/cadence_gem.c +1
-1/* Copy packet data to emulated DMA buffer */ address_space_write(&s->dma_as, rx_desc_get_buffer(s, s->rx_desc[q]) +@@ -1156,7 +1156,7 @@ static void gem_transmit(CadenceGEMState *s)if (tx_desc_get_length (desc) >sizeof (tx_packet) - (p - tx_packet)) { DB_PRINT("TX descriptor @ 0x%x too large: size 0x%x space " \ - "0x%x\n", (unsigned)packet_desc_addr, + "0x%lx\n", (unsigned)packet_desc_addr,
Here the correct format seems to be "%zd" (difference of sizeof).
hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1162
Quoted 4 lines
hw/net/cadence_gem.c +0
-0(unsigned )tx_desc_get_length (desc), sizeof(tx_packet) - (p - tx_packet));break ;
Nowadays QEMU prefers to move from the old DB_PRINT() macros to the trace events API, see for example this commit:
The first line you changed would be replaced by a trace event, while the second could be replaced by a qemu_log_mask() call (it is an error condition).
Also I suggest to include "QEMU Trivial <[email protected]>" in the list of recipients, so your patch might get reviewed/merged quicker.
Regards,
Phil.
Quoted 85 lines · Philippe Mathieu-Daudé
Hi Ramon,
hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const
Quoted 13 lines · Ramon Fried
defining
CADENCE_GEM_ERR_DEBUGcauses compilation
errors, fix that.Signed-off-by Ramon Fried <[email protected]>--- hw/net/cadence_gem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/net/cadence_gem.c +0
-0@@ -982,8 +982,8 @@ static ssize_t gem_receive(NetClientState *nc, const
uint8_t*buf,size_tsize)hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
Quoted 4 lines
hw/net/cadence_gem.c +0
-1return -1 ; } - DB_PRINT("copy %d bytes to 0x%x\n", MIN(bytes_to_copy,rxbufsize),
hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const · line 985
Quoted 2 lines
hw/net/cadence_gem.c +1
-1- rx_desc_get_buffer(s->rx_desc[q])); + DB_PRINT("copy %d bytes to 0x%lx\n", MIN(bytes_to_copy,rxbufsize),
hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size) · line 986
Quoted 1 line
hw/net/cadence_gem.c +1
-0+ rx_desc_get_buffer(s, s->rx_desc[q]));Your patch fails on 32-bit hosts:
./hw/net/cadence_gem.c:987:18: error: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t{aka long long unsigned int}' [-Werror=format=]DB_PRINT("copy %d bytes to 0x%lx\n", MIN(bytes_to_copy, rxbufsize), ^ ./hw/net/cadence_gem.c:39:24: note: in definition of macro 'DB_PRINT' fprintf(stderr, ## __VA_ARGS__); \ ^
./hw/net/cadence_gem.c: In function 'gem_transmit':./hw/net/cadence_gem.c:1160:26: error: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'unsigned int' [-Werror=format=]DB_PRINT("TX descriptor @ 0x%x too large: size 0x%x space " \ ^ ./hw/net/cadence_gem.c:39:24: note: in definition of macro 'DB_PRINT' fprintf(stderr, ## __VA_ARGS__); \ ^cc1: all warnings being treated as errors
QEMU provides "
HWADDR_PRIx" format for addresses, see for example few lines earlier:DB_PRINT("read descriptor 0x%" HWADDR_PRIx "\n", packet_desc_addr);hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const · line 988
Quoted 3 lines
hw/net/cadence_gem.c +0
-0/* Copy packet data to emulated DMA buffer */ address_space_write(&s->dma_as, rx_desc_get_buffer(s,s->rx_desc[q]) +
hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1158
Quoted 4 lines
hw/net/cadence_gem.c +0
-0@@ -1156,7 +1156,7 @@ static void gem_transmit(CadenceGEMState *s)if (tx_desc_get_length (desc) >sizeof (tx_packet) - (p - tx_packet)) { DB_PRINT("TX descriptor @ 0x%x too large: size 0x%xspace " \
hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1159
Quoted 2 lines
hw/net/cadence_gem.c +1
-1- "0x%x\n", (unsigned)packet_desc_addr, + "0x%lx\n", (unsigned)packet_desc_addr,Here the correct format seems to be "%zd" (difference of sizeof).
hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1162
Quoted 4 lines
hw/net/cadence_gem.c +0
-0(unsigned )tx_desc_get_length (desc), sizeof(tx_packet) - (p - tx_packet));break ;Nowadays QEMU prefers to move from the old
DB_PRINT()macros to the trace events API, see for example this commit:The first line you changed would be replaced by a trace event, while the second could be replaced by a
qemu_log_mask()call (it is an error condition).
Quoted 7 lines
Also I suggest to include "QEMU Trivial <[email protected]>" in the list of recipients, so your patch might get reviewed/merged quicker.
Regards,
Phil.
Hi Phil,
Thanks for the review, I'll send v2 soon.