motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

util/hexdump: Add unit_len and block_len to qemu_hexdump_line

Browse source 
Generalize the current 1 byte unit and 4 byte blocking
within the output.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240412073346.458116-5-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-12 00:33:23 -07:00
parent 53ee5f551e
commit c49d1c37d8
3 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/virtio/vhost-vdpa.c
View file

@ -951,7 +951,7 @@ static void vhost_vdpa_dump_config(struct vhost_dev *dev, const uint8_t *config,
len = MIN(config_len - b, 16); len = MIN(config_len - b, 16);
g_string_truncate(str, 0); 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); trace_vhost_vdpa_dump_config(dev, b, str->str);
} }
} }

6
include/qemu/cutils.h
View file

@ -287,12 +287,16 @@ int parse_debug_env(const char *name, int max, int initial);
* @str: GString into which to append * @str: GString into which to append
* @buf: buffer to dump * @buf: buffer to dump
* @len: number of bytes 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. * 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; * If @str is NULL, allocate a new string and return it;
* otherwise return @str. * 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 * Hexdump a buffer to a file. An optional string prefix is added to every line

30
util/hexdump.c
View file

@ -1,5 +1,5 @@
/* /*
* Helper to hexdump a buffer * Helper to hexdump a buffer
* *
* Copyright (c) 2013 Red Hat, Inc. * Copyright (c) 2013 Red Hat, Inc.
* Copyright (c) 2013 Gerd Hoffmann <kraxel@redhat.com> * Copyright (c) 2013 Gerd Hoffmann <kraxel@redhat.com>
@ -16,22 +16,34 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/cutils.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; const uint8_t *buf = vbuf;
size_t i; size_t u, b;
if (str == NULL) { if (str == NULL) {
/* Estimate the length of the output to avoid reallocs. */ /* Estimate the length of the output to avoid reallocs. */
i = len * 3 + len / 4; size_t est = len * 2;
str = g_string_sized_new(i + 1); 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++) { for (u = 0, b = 0; len; u++, b++, len--, buf++) {
if (i != 0 && (i % 4) == 0) { if (unit_len && u == unit_len) {
g_string_append_c(str, ' '); 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; return str;
@ -67,7 +79,7 @@ void qemu_hexdump(FILE *fp, const char *prefix,
len = MIN(size - b, QEMU_HEXDUMP_LINE_BYTES); len = MIN(size - b, QEMU_HEXDUMP_LINE_BYTES);
g_string_truncate(str, 0); 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); asciidump_line(ascii, bufptr + b, len);
fprintf(fp, "%s: %04zx: %-*s %s\n", fprintf(fp, "%s: %04zx: %-*s %s\n",