hw/net/cadence_gem.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
When CADENCE_GEM_ERR_DEBUG is turned on, there are several
compilation errors in DB_PRINT(). Fix them.
While we are here, update to use appropriate modifiers in
the same DB_PRINT() call.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
Changes in v3:
- use PRIx64 as rx_desc_get_buffer() returns uint64_t
- use %u for unsigned
- remove unnecessary cast in DB_PRINT()
Changes in v2:
- use HWADDR_PRIx instead of TARGET_FMT_plx for consistency
- use 'z' modifier to print sizeof(..)
hw/net/cadence_gem.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index d412085..e26ff98 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -983,8 +983,9 @@ 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 %u bytes to 0x%" PRIx64 "\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,9 +1157,9 @@ 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,
- (unsigned)tx_desc_get_length(desc),
+ DB_PRINT("TX descriptor @ 0x%" HWADDR_PRIx \
+ " too large: size 0x%x space 0x%zx\n",
+ packet_desc_addr, tx_desc_get_length(desc),
sizeof(tx_packet) - (p - tx_packet));
break;
}
--
2.7.4
On Fri, Aug 9, 2019 at 12:26 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> When CADENCE_GEM_ERR_DEBUG is turned on, there are several
> compilation errors in DB_PRINT(). Fix them.
>
> While we are here, update to use appropriate modifiers in
> the same DB_PRINT() call.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
>
> ---
>
> Changes in v3:
> - use PRIx64 as rx_desc_get_buffer() returns uint64_t
> - use %u for unsigned
> - remove unnecessary cast in DB_PRINT()
>
> Changes in v2:
> - use HWADDR_PRIx instead of TARGET_FMT_plx for consistency
> - use 'z' modifier to print sizeof(..)
>
> hw/net/cadence_gem.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
> index d412085..e26ff98 100644
> --- a/hw/net/cadence_gem.c
> +++ b/hw/net/cadence_gem.c
> @@ -983,8 +983,9 @@ 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 %u bytes to 0x%" PRIx64 "\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,9 +1157,9 @@ 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,
> - (unsigned)tx_desc_get_length(desc),
> + DB_PRINT("TX descriptor @ 0x%" HWADDR_PRIx \
> + " too large: size 0x%x space 0x%zx\n",
> + packet_desc_addr, tx_desc_get_length(desc),
> sizeof(tx_packet) - (p - tx_packet));
> break;
> }
> --
> 2.7.4
>
>
On Sat, Aug 10, 2019 at 9:58 AM Alistair Francis <alistair23@gmail.com> wrote: > > On Fri, Aug 9, 2019 at 12:26 AM Bin Meng <bmeng.cn@gmail.com> wrote: > > > > When CADENCE_GEM_ERR_DEBUG is turned on, there are several > > compilation errors in DB_PRINT(). Fix them. > > > > While we are here, update to use appropriate modifiers in > > the same DB_PRINT() call. > > > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > Ping? What's the status of this patch? Regards, Bin
On 2019/8/19 下午1:24, Bin Meng wrote: > On Sat, Aug 10, 2019 at 9:58 AM Alistair Francis <alistair23@gmail.com> wrote: >> On Fri, Aug 9, 2019 at 12:26 AM Bin Meng <bmeng.cn@gmail.com> wrote: >>> When CADENCE_GEM_ERR_DEBUG is turned on, there are several >>> compilation errors in DB_PRINT(). Fix them. >>> >>> While we are here, update to use appropriate modifiers in >>> the same DB_PRINT() call. >>> >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> >> > Ping? > > What's the status of this patch? > > Regards, > Bin Applied. Thanks
Hi Jason, On Mon, Aug 19, 2019 at 1:40 PM Jason Wang <jasowang@redhat.com> wrote: > > > On 2019/8/19 下午1:24, Bin Meng wrote: > > On Sat, Aug 10, 2019 at 9:58 AM Alistair Francis <alistair23@gmail.com> wrote: > >> On Fri, Aug 9, 2019 at 12:26 AM Bin Meng <bmeng.cn@gmail.com> wrote: > >>> When CADENCE_GEM_ERR_DEBUG is turned on, there are several > >>> compilation errors in DB_PRINT(). Fix them. > >>> > >>> While we are here, update to use appropriate modifiers in > >>> the same DB_PRINT() call. > >>> > >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > >> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > >> > > Ping? > > > > What's the status of this patch? > > > > Regards, > > Bin > > > Applied. I checked latest qemu/master and found this patch isn't applied. Could you please take a look? Regards, Bin
On 2020/2/13 下午5:39, Bin Meng wrote: > Hi Jason, > > On Mon, Aug 19, 2019 at 1:40 PM Jason Wang <jasowang@redhat.com> wrote: >> >> On 2019/8/19 下午1:24, Bin Meng wrote: >>> On Sat, Aug 10, 2019 at 9:58 AM Alistair Francis <alistair23@gmail.com> wrote: >>>> On Fri, Aug 9, 2019 at 12:26 AM Bin Meng <bmeng.cn@gmail.com> wrote: >>>>> When CADENCE_GEM_ERR_DEBUG is turned on, there are several >>>>> compilation errors in DB_PRINT(). Fix them. >>>>> >>>>> While we are here, update to use appropriate modifiers in >>>>> the same DB_PRINT() call. >>>>> >>>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >>>> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> >>>> >>> Ping? >>> >>> What's the status of this patch? >>> >>> Regards, >>> Bin >> >> Applied. > I checked latest qemu/master and found this patch isn't applied. Could > you please take a look? > > Regards, > Bin For some unknown reason it was lost, I've applied in my tree and it will be in the next pull request. Sorry.
© 2016 - 2024 Red Hat, Inc.