SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util/hexdump: Remove ascii parameter from qemu_hexdump_line

Browse Source 
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>
This commit is contained in:
Richard Henderson 2024-04-12 00:33:21 -07:00 committed by Philippe Mathieu-Daudé
parent 5837a76cd2
commit 13dfa93300
3 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) { for (b = 0; b < config_len; b += 16) {
len = config_len - b; 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); trace_vhost_vdpa_dump_config(dev, b, line);
} }
} }

3
include/qemu/cutils.h
View File

@ -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_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, const void *bufptr, void qemu_hexdump_line(char *line, const void *bufptr, size_t len);
unsigned int len, bool ascii);
/* /*
* 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

42
util/hexdump.c
View File

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