mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/hexdump: Remove b parameter from qemu_hexdump_line

Browse Source 
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240412073346.458116-2-richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-12 00:33:20 -07:00 committed by Philippe Mathieu-Daudé
parent c54c6a1088
commit 5837a76cd2
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/virtio/trace-events
View File

@ -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_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_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_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 0x%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_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_get_config(void *dev, void *config, uint32_t config_len) "dev: %p config: %p config_len: %"PRIu32
vhost_vdpa_suspend(void *dev) "dev: %p" vhost_vdpa_suspend(void *dev) "dev: %p"

4
hw/virtio/vhost-vdpa.c
View File

@ -949,8 +949,8 @@ static void vhost_vdpa_dump_config(struct vhost_dev *dev, const uint8_t *config,
for (b = 0; b < config_len; b += 16) { for (b = 0; b < config_len; b += 16) {
len = config_len - b; len = config_len - b;
qemu_hexdump_line(line, b, config, len, false); qemu_hexdump_line(line, config + b, len, false);
trace_vhost_vdpa_dump_config(dev, line); trace_vhost_vdpa_dump_config(dev, b, line);
} }
} }

2
include/qemu/cutils.h
View File

@ -287,7 +287,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_BYTES 16 /* Number of bytes to dump */
#define QEMU_HEXDUMP_LINE_LEN 75 /* Number of characters in line */ #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); unsigned int len, bool ascii);
/* /*

13
util/hexdump.c
View File

@ -16,7 +16,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/cutils.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) unsigned int len, bool ascii)
{ {
const char *buf = bufptr; 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; len = QEMU_HEXDUMP_LINE_BYTES;
} }
line += snprintf(line, 6, "%04x:", b);
for (i = 0; i < QEMU_HEXDUMP_LINE_BYTES; i++) { for (i = 0; i < QEMU_HEXDUMP_LINE_BYTES; i++) {
if ((i % 4) == 0) { if (i != 0 && (i % 4) == 0) {
*line++ = ' '; *line++ = ' ';
} }
if (i < len) { if (i < len) {
line += sprintf(line, " %02x", (unsigned char)buf[b + i]); line += sprintf(line, " %02x", (unsigned char)buf[i]);
} else { } else {
line += sprintf(line, " "); line += sprintf(line, " ");
} }
@ -40,7 +39,7 @@ void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr,
if (ascii) { if (ascii) {
*line++ = ' '; *line++ = ' ';
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
c = buf[b + i]; c = buf[i];
if (c < ' ' || c > '~') { if (c < ' ' || 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) { for (b = 0; b < size; b += QEMU_HEXDUMP_LINE_BYTES) {
len = size - b; len = size - b;
qemu_hexdump_line(line, b, bufptr, len, true); qemu_hexdump_line(line, bufptr + b, len, true);
fprintf(fp, "%s: %s\n", prefix, line); fprintf(fp, "%s: %04x: %s\n", prefix, b, line);
} }
} }