[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v4 13/48] util/hexdump: introduce qemu_hexdump_line()
From: |
Michael S. Tsirkin |
Subject: |
[PULL v4 13/48] util/hexdump: introduce qemu_hexdump_line() |
Date: |
Tue, 29 Sep 2020 03:21:25 -0400 |
From: Laurent Vivier <lvivier@redhat.com>
Dumping one line of hexadecimal/ASCII from a buffer is often needed.
Move this part from qemu_hexdump() and use it
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20200925091055.186023-2-lvivier@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/qemu-common.h | 8 +++++++
util/hexdump.c | 54 +++++++++++++++++++++++++++----------------
2 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 9cfd62669b..cc902b690d 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -134,6 +134,14 @@ void os_setup_early_signal_handling(void);
char *os_find_datadir(void);
int os_parse_cmd_args(int index, const char *optarg);
+/*
+ * Hexdump a line of a byte buffer into a hexadecimal/ASCII buffer
+ */
+#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, unsigned int b, const void *bufptr,
+ unsigned int len, bool ascii);
+
/*
* 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 0b4662e701..2c105a8846 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -16,36 +16,50 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-void qemu_hexdump(FILE *fp, const char *prefix,
- const void *bufptr, size_t size)
+void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr,
+ unsigned int len, bool ascii)
{
const char *buf = bufptr;
- unsigned int b, len, i, c;
+ int i, c;
- for (b = 0; b < size; b += 16) {
- len = size - b;
- if (len > 16) {
- len = 16;
+ if (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++) {
+ if ((i % 4) == 0) {
+ *line++ = ' ';
}
- fprintf(fp, "%s: %04x:", prefix, b);
- for (i = 0; i < 16; i++) {
- if ((i % 4) == 0) {
- fprintf(fp, " ");
- }
- if (i < len) {
- fprintf(fp, " %02x", (unsigned char)buf[b + i]);
- } else {
- fprintf(fp, " ");
- }
+ if (i < len) {
+ line += sprintf(line, " %02x", (unsigned char)buf[b + i]);
+ } else {
+ line += sprintf(line, " ");
}
- fprintf(fp, " ");
+ }
+ if (ascii) {
+ *line++ = ' ';
for (i = 0; i < len; i++) {
c = buf[b + i];
if (c < ' ' || c > '~') {
c = '.';
}
- fprintf(fp, "%c", c);
+ *line++ = c;
}
- fprintf(fp, "\n");
}
+ *line = '\0';
+}
+
+void qemu_hexdump(FILE *fp, const char *prefix,
+ const void *bufptr, size_t size)
+{
+ unsigned int b, len;
+ char line[QEMU_HEXDUMP_LINE_LEN];
+
+ for (b = 0; b < size; b += QEMU_HEXDUMP_LINE_BYTES) {
+ len = size - b;
+ qemu_hexdump_line(line, b, bufptr, len, true);
+ fprintf(fp, "%s: %s\n", prefix, line);
+ }
+
}
--
MST
- [PULL v4 00/48] virtio,pc,acpi: fixes, tests, Michael S. Tsirkin, 2020/09/29
- [PULL v4 03/48] vhost-vdpa: batch updating IOTLB mappings, Michael S. Tsirkin, 2020/09/29
- [PULL v4 05/48] pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine, Michael S. Tsirkin, 2020/09/29
- [PULL v4 04/48] virtio-mem: detach the element from the virtqueue when error occurs, Michael S. Tsirkin, 2020/09/29
- [PULL v4 06/48] vhost: recheck dev state in the vhost_migration_log routine, Michael S. Tsirkin, 2020/09/29
- [PULL v4 07/48] vhost: check queue state in the vhost_dev_set_log routine, Michael S. Tsirkin, 2020/09/29
- [PULL v4 08/48] tests/qtest/vhost-user-test: prepare the tests for adding new dev class, Michael S. Tsirkin, 2020/09/29
- [PULL v4 10/48] virtio-iommu: Check gtrees are non null before destroying them, Michael S. Tsirkin, 2020/09/29
- [PULL v4 11/48] virtio-iommu-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 09/48] cphp: remove deprecated cpu-add command(s), Michael S. Tsirkin, 2020/09/29
- [PULL v4 13/48] util/hexdump: introduce qemu_hexdump_line(),
Michael S. Tsirkin <=
- [PULL v4 14/48] vhost-vdpa: add trace-events, Michael S. Tsirkin, 2020/09/29
- [PULL v4 15/48] configure: Fix build dependencies with vhost-vdpa., Michael S. Tsirkin, 2020/09/29
- [PULL v4 16/48] virtio: skip legacy support check on machine types less than 5.1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 17/48] vhost-vsock-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 18/48] vhost-user-vsock-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 19/48] vhost-vsock-ccw: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 22/48] x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use, Michael S. Tsirkin, 2020/09/29
- [PULL v4 21/48] x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features, Michael S. Tsirkin, 2020/09/29
- [PULL v4 24/48] acpi: add aml_land() and aml_break() primitives, Michael S. Tsirkin, 2020/09/29
- [PULL v4 25/48] tests: acpi: mark to be changed tables in bios-tables-test-allowed-diff, Michael S. Tsirkin, 2020/09/29