| Message ID | 20240412073346.458116-2-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | misc: Replace sprintf | expand |
On 12/4/24 09:33, Richard Henderson wrote: > Require that the caller output the offset and increment bufptr. > Use QEMU_HEXDUMP_LINE_BYTES in vhost_vdpa_dump_config instead > of raw integer. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/qemu/cutils.h | 2 +- > hw/virtio/vhost-vdpa.c | 4 ++-- > util/hexdump.c | 13 ++++++------- > hw/virtio/trace-events | 2 +- > 4 files changed, 10 insertions(+), 11 deletions(-) > @@ -58,8 +57,8 @@ void qemu_hexdump(FILE *fp, const char *prefix, > > for (b = 0; b < size; b += QEMU_HEXDUMP_LINE_BYTES) { > len = size - b; > - qemu_hexdump_line(line, b, bufptr, len, true); > - fprintf(fp, "%s: %s\n", prefix, line); > + qemu_hexdump_line(line, bufptr + b, len, true); > + fprintf(fp, "%s: %04x: %s\n", prefix, b, line); Clever :) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 12/4/24 09:33, Richard Henderson wrote: > Require that the caller output the offset and increment bufptr. > Use QEMU_HEXDUMP_LINE_BYTES in vhost_vdpa_dump_config instead > of raw integer. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/qemu/cutils.h | 2 +- > hw/virtio/vhost-vdpa.c | 4 ++-- > util/hexdump.c | 13 ++++++------- > hw/virtio/trace-events | 2 +- > 4 files changed, 10 insertions(+), 11 deletions(-) > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index 96632fd026..d01bc85037 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -50,7 +50,7 @@ vhost_vdpa_get_device_id(void *dev, uint32_t device_id) "dev: %p device_id %"PRI > vhost_vdpa_reset_device(void *dev) "dev: %p" > vhost_vdpa_get_vq_index(void *dev, int idx, int vq_idx) "dev: %p idx: %d vq idx: %d" > vhost_vdpa_set_vring_enable_one(void *dev, unsigned i, int enable, int r) "dev: %p, idx: %u, enable: %u, r: %d" > -vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s" > +vhost_vdpa_dump_config(void *dev, unsigned ofs, const char *line) "dev: %p %04x: %s" Queued squashing "0x" due to: ERROR: Hex numbers must be prefixed with '0x' #108: FILE: hw/virtio/trace-events:53: +vhost_vdpa_dump_config(void *dev, unsigned ofs, const char *line) "dev: %p %04x: %s" total: 1 errors, 0 warnings, 67 lines checked
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 92c927a6a3..3415f5d249 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -257,7 +257,7 @@ int parse_debug_env(const char *name, int max, int initial); */ #define QEMU_HEXDUMP_LINE_BYTES 16 /* Number of bytes to dump */ #define QEMU_HEXDUMP_LINE_LEN 75 /* Number of characters in line */ -void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr, +void qemu_hexdump_line(char *line, const void *bufptr, unsigned int len, bool ascii); /* diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index e827b9175f..b4afa142f6 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -946,8 +946,8 @@ static void vhost_vdpa_dump_config(struct vhost_dev *dev, const uint8_t *config, for (b = 0; b < config_len; b += 16) { len = config_len - b; - qemu_hexdump_line(line, b, config, len, false); - trace_vhost_vdpa_dump_config(dev, line); + qemu_hexdump_line(line, config + b, len, false); + trace_vhost_vdpa_dump_config(dev, b, line); } } diff --git a/util/hexdump.c b/util/hexdump.c index 9921114b3c..7324e7b126 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" -void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr, +void qemu_hexdump_line(char *line, const void *bufptr, unsigned int len, bool ascii) { const char *buf = bufptr; @@ -26,13 +26,12 @@ void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr, len = QEMU_HEXDUMP_LINE_BYTES; } - line += snprintf(line, 6, "%04x:", b); for (i = 0; i < QEMU_HEXDUMP_LINE_BYTES; i++) { - if ((i % 4) == 0) { + if (i != 0 && (i % 4) == 0) { *line++ = ' '; } if (i < len) { - line += sprintf(line, " %02x", (unsigned char)buf[b + i]); + line += sprintf(line, " %02x", (unsigned char)buf[i]); } else { line += sprintf(line, " "); } @@ -40,7 +39,7 @@ void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr, if (ascii) { *line++ = ' '; for (i = 0; i < len; i++) { - c = buf[b + i]; + c = buf[i]; if (c < ' ' || c > '~') { c = '.'; } @@ -58,8 +57,8 @@ void qemu_hexdump(FILE *fp, const char *prefix, for (b = 0; b < size; b += QEMU_HEXDUMP_LINE_BYTES) { len = size - b; - qemu_hexdump_line(line, b, bufptr, len, true); - fprintf(fp, "%s: %s\n", prefix, line); + qemu_hexdump_line(line, bufptr + b, len, true); + fprintf(fp, "%s: %04x: %s\n", prefix, b, line); } } diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 96632fd026..d01bc85037 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -50,7 +50,7 @@ vhost_vdpa_get_device_id(void *dev, uint32_t device_id) "dev: %p device_id %"PRI vhost_vdpa_reset_device(void *dev) "dev: %p" vhost_vdpa_get_vq_index(void *dev, int idx, int vq_idx) "dev: %p idx: %d vq idx: %d" vhost_vdpa_set_vring_enable_one(void *dev, unsigned i, int enable, int r) "dev: %p, idx: %u, enable: %u, r: %d" -vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s" +vhost_vdpa_dump_config(void *dev, unsigned ofs, const char *line) "dev: %p %04x: %s" vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32 vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev: %p config: %p config_len: %"PRIu32 vhost_vdpa_suspend(void *dev) "dev: %p"
Require that the caller output the offset and increment bufptr. Use QEMU_HEXDUMP_LINE_BYTES in vhost_vdpa_dump_config instead of raw integer. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/qemu/cutils.h | 2 +- hw/virtio/vhost-vdpa.c | 4 ++-- util/hexdump.c | 13 ++++++------- hw/virtio/trace-events | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-)