@@ -257,12 +257,16 @@ int parse_debug_env(const char *name, int max, int initial);
* @str: GString into which to append
* @buf: buffer to dump
* @len: number of bytes to dump
+ * @unit_len: add a space between every @unit_len bytes
+ * @block_len: add an extra space between every @block_len bytes
*
* Append @len bytes of @buf as hexadecimal into @str.
+ * Add spaces between every @unit_len and @block_len bytes.
* If @str is NULL, allocate a new string and return it;
* otherwise return @str.
*/
-GString *qemu_hexdump_line(GString *str, const void *buf, size_t len);
+GString *qemu_hexdump_line(GString *str, const void *buf, size_t len,
+ size_t unit_len, size_t block_len);
/*
* Hexdump a buffer to a file. An optional string prefix is added to every line
@@ -948,7 +948,7 @@ static void vhost_vdpa_dump_config(struct vhost_dev *dev, const uint8_t *config,
len = MIN(config_len - b, 16);
g_string_truncate(str, 0);
- qemu_hexdump_line(str, config + b, len);
+ qemu_hexdump_line(str, config + b, len, 1, 4);
trace_vhost_vdpa_dump_config(dev, b, str->str);
}
}
@@ -1,5 +1,5 @@
/*
- * Helper to hexdump a buffer
+* Helper to hexdump a buffer
*
* Copyright (c) 2013 Red Hat, Inc.
* Copyright (c) 2013 Gerd Hoffmann <kraxel@redhat.com>
@@ -16,22 +16,34 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
-GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len)
+GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len,
+ size_t unit_len, size_t block_len)
{
const uint8_t *buf = vbuf;
- size_t i;
+ size_t u, b;
if (str == NULL) {
/* Estimate the length of the output to avoid reallocs. */
- i = len * 3 + len / 4;
- str = g_string_sized_new(i + 1);
+ size_t est = len * 2;
+ if (unit_len) {
+ est += len / unit_len;
+ }
+ if (block_len) {
+ est += len / block_len;
+ }
+ str = g_string_sized_new(est + 1);
}
- for (i = 0; i < len; i++) {
- if (i != 0 && (i % 4) == 0) {
+ for (u = 0, b = 0; len; u++, b++, len--, buf++) {
+ if (unit_len && u == unit_len) {
g_string_append_c(str, ' ');
+ u = 0;
}
- g_string_append_printf(str, " %02x", buf[i]);
+ if (block_len && b == block_len) {
+ g_string_append_c(str, ' ');
+ b = 0;
+ }
+ g_string_append_printf(str, "%02x", *buf);
}
return str;
@@ -67,7 +79,7 @@ void qemu_hexdump(FILE *fp, const char *prefix,
len = MIN(size - b, QEMU_HEXDUMP_LINE_BYTES);
g_string_truncate(str, 0);
- qemu_hexdump_line(str, bufptr + b, len);
+ qemu_hexdump_line(str, bufptr + b, len, 1, 4);
asciidump_line(ascii, bufptr + b, len);
fprintf(fp, "%s: %04zx: %-*s %s\n",
Generalize the current 1 byte unit and 4 byte blocking within the output. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/qemu/cutils.h | 6 +++++- hw/virtio/vhost-vdpa.c | 2 +- util/hexdump.c | 30 +++++++++++++++++++++--------- 3 files changed, 27 insertions(+), 11 deletions(-)