aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2024-04-12 00:33:21 -0700
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-06-04 10:02:39 +0200
commit13dfa93300285b88df96ca4366f499c5a137d5b2 (patch)
treee375c18bc04f4f6e5ba96ddaf3211cc0b8ee02a0
parent5837a76cd2e6fe6345a4c7dcecec58f23f42a3e6 (diff)
downloadqemu-13dfa93300285b88df96ca4366f499c5a137d5b2.zip
qemu-13dfa93300285b88df96ca4366f499c5a137d5b2.tar.gz
qemu-13dfa93300285b88df96ca4366f499c5a137d5b2.tar.bz2
util/hexdump: Remove ascii parameter from qemu_hexdump_line
Split out asciidump_line as a separate function, local to hexdump.c, for use by qemu_hexdump. Use "%-*s" to generate the alignment between the hex and the ascii, rather than explicit spaces. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20240412073346.458116-3-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-rw-r--r--hw/virtio/vhost-vdpa.c2
-rw-r--r--include/qemu/cutils.h3
-rw-r--r--util/hexdump.c52
3 files changed, 32 insertions, 25 deletions
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index f3a86c1..7368b71 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -949,7 +949,7 @@ 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, config + b, len, false);
+ qemu_hexdump_line(line, config + b, len);
trace_vhost_vdpa_dump_config(dev, b, line);
}
}
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index d7715f7..c5dea63 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -287,8 +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_LEN 75 /* Number of characters in line */
-void qemu_hexdump_line(char *line, const void *bufptr,
- unsigned int len, bool ascii);
+void qemu_hexdump_line(char *line, const void *bufptr, size_t len);
/*
* Hexdump a buffer to a file. An optional string prefix is added to every line
diff --git a/util/hexdump.c b/util/hexdump.c
index 7324e7b..0f943e3 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -16,49 +16,57 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
-void qemu_hexdump_line(char *line, const void *bufptr,
- unsigned int len, bool ascii)
+void qemu_hexdump_line(char *line, const void *bufptr, size_t len)
{
const char *buf = bufptr;
- int i, c;
+ int i;
if (len > QEMU_HEXDUMP_LINE_BYTES) {
len = QEMU_HEXDUMP_LINE_BYTES;
}
- for (i = 0; i < QEMU_HEXDUMP_LINE_BYTES; i++) {
+ for (i = 0; i < len; i++) {
if (i != 0 && (i % 4) == 0) {
*line++ = ' ';
}
- if (i < len) {
- line += sprintf(line, " %02x", (unsigned char)buf[i]);
- } else {
- line += sprintf(line, " ");
- }
+ line += sprintf(line, " %02x", (unsigned char)buf[i]);
}
- if (ascii) {
- *line++ = ' ';
- for (i = 0; i < len; i++) {
- c = buf[i];
- if (c < ' ' || c > '~') {
- c = '.';
- }
- *line++ = c;
+ *line = '\0';
+}
+
+static void asciidump_line(char *line, const void *bufptr, size_t len)
+{
+ const char *buf = bufptr;
+
+ for (size_t i = 0; i < len; i++) {
+ char c = buf[i];
+
+ if (c < ' ' || c > '~') {
+ c = '.';
}
+ *line++ = c;
}
*line = '\0';
}
+#define QEMU_HEXDUMP_LINE_WIDTH \
+ (QEMU_HEXDUMP_LINE_BYTES * 2 + QEMU_HEXDUMP_LINE_BYTES / 4)
+
void qemu_hexdump(FILE *fp, const char *prefix,
const void *bufptr, size_t size)
{
- unsigned int b, len;
char line[QEMU_HEXDUMP_LINE_LEN];
+ char ascii[QEMU_HEXDUMP_LINE_BYTES + 1];
+ size_t b, len;
+
+ for (b = 0; b < size; b += len) {
+ len = MIN(size - b, QEMU_HEXDUMP_LINE_BYTES);
+
+ qemu_hexdump_line(line, bufptr + b, len);
+ asciidump_line(ascii, bufptr + b, len);
- for (b = 0; b < size; b += QEMU_HEXDUMP_LINE_BYTES) {
- len = size - b;
- qemu_hexdump_line(line, bufptr + b, len, true);
- fprintf(fp, "%s: %04x: %s\n", prefix, b, line);
+ fprintf(fp, "%s: %04zx: %-*s %s\n",
+ prefix, b, QEMU_HEXDUMP_LINE_WIDTH, line, ascii);
}
}