[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/18] util/hexdump: Convert to take a void pointer argument
From: |
Laurent Vivier |
Subject: |
[PULL 16/18] util/hexdump: Convert to take a void pointer argument |
Date: |
Fri, 11 Sep 2020 21:33:28 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Most uses of qemu_hexdump() do not take an array of char
as input, forcing use of cast. Since we can use this
helper to dump any kind of buffer, use a pointer to void
argument instead.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20200822180950.1343963-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/dma/xlnx_dpdma.c | 2 +-
hw/net/fsl_etsec/etsec.c | 2 +-
hw/sd/sd.c | 2 +-
hw/usb/redirect.c | 2 +-
include/qemu-common.h | 3 ++-
net/colo-compare.c | 12 ++++++------
net/net.c | 2 +-
util/hexdump.c | 4 +++-
8 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c
index b40c897de2c7..d75a8069426f 100644
--- a/hw/dma/xlnx_dpdma.c
+++ b/hw/dma/xlnx_dpdma.c
@@ -388,7 +388,7 @@ static void xlnx_dpdma_dump_descriptor(DPDMADescriptor
*desc)
{
if (DEBUG_DPDMA) {
qemu_log("DUMP DESCRIPTOR:\n");
- qemu_hexdump((char *)desc, stdout, "", sizeof(DPDMADescriptor));
+ qemu_hexdump(desc, stdout, "", sizeof(DPDMADescriptor));
}
}
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index ad20b22cdd26..5c40303f93c1 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -357,7 +357,7 @@ static ssize_t etsec_receive(NetClientState *nc,
#if defined(HEX_DUMP)
fprintf(stderr, "%s receive size:%zd\n", nc->name, size);
- qemu_hexdump((void *)buf, stderr, "", size);
+ qemu_hexdump(buf, stderr, "", size);
#endif
/* Flush is unnecessary as are already in receiving path */
etsec->need_flush = false;
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 483c4f172045..1c8f8529ea88 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1785,7 +1785,7 @@ send_response:
}
#ifdef DEBUG_SD
- qemu_hexdump((const char *)response, stderr, "Response", rsplen);
+ qemu_hexdump(response, stderr, "Response", rsplen);
#endif
return rsplen;
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 417a60a2e680..09edb0d81c07 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -240,7 +240,7 @@ static void usbredir_log_data(USBRedirDevice *dev, const
char *desc,
if (dev->debug < usbredirparser_debug_data) {
return;
}
- qemu_hexdump((char *)data, stderr, desc, len);
+ qemu_hexdump(data, stderr, desc, len);
}
/*
diff --git a/include/qemu-common.h b/include/qemu-common.h
index bb9496bd80fe..6834883822f1 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -138,7 +138,8 @@ int os_parse_cmd_args(int index, const char *optarg);
* Hexdump a buffer to a file. An optional string prefix is added to every line
*/
-void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
+void qemu_hexdump(const void *bufptr, FILE *fp,
+ const char *prefix, size_t size);
/*
* helper to parse debug environment variables
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 2c20de1537d4..550272b3baa6 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -494,9 +494,9 @@ sec:
g_queue_push_head(&conn->secondary_list, spkt);
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
- qemu_hexdump((char *)ppkt->data, stderr,
+ qemu_hexdump(ppkt->data, stderr,
"colo-compare ppkt", ppkt->size);
- qemu_hexdump((char *)spkt->data, stderr,
+ qemu_hexdump(spkt->data, stderr,
"colo-compare spkt", spkt->size);
}
@@ -535,9 +535,9 @@ static int colo_packet_compare_udp(Packet *spkt, Packet
*ppkt)
trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size);
trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size);
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
- qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt",
+ qemu_hexdump(ppkt->data, stderr, "colo-compare pri pkt",
ppkt->size);
- qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",
+ qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt",
spkt->size);
}
return -1;
@@ -578,9 +578,9 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet
*ppkt)
trace_colo_compare_icmp_miscompare("Secondary pkt size",
spkt->size);
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
- qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt",
+ qemu_hexdump(ppkt->data, stderr, "colo-compare pri pkt",
ppkt->size);
- qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",
+ qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt",
spkt->size);
}
return -1;
diff --git a/net/net.c b/net/net.c
index bbaedb3c7a6d..f3e5d533fd74 100644
--- a/net/net.c
+++ b/net/net.c
@@ -636,7 +636,7 @@ static ssize_t
qemu_send_packet_async_with_flags(NetClientState *sender,
#ifdef DEBUG_NET
printf("qemu_send_packet_async:\n");
- qemu_hexdump((const char *)buf, stdout, "net", size);
+ qemu_hexdump(buf, stdout, "net", size);
#endif
if (sender->link_down || !sender->peer) {
diff --git a/util/hexdump.c b/util/hexdump.c
index f879ff0ad6b6..053f05d41603 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -16,8 +16,10 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)
+void qemu_hexdump(const void *bufptr, FILE *fp,
+ const char *prefix, size_t size)
{
+ const char *buf = bufptr;
unsigned int b, len, i, c;
for (b = 0; b < size; b += 16) {
--
2.26.2
- [PULL 01/18] hw/mips/fuloong2e: Convert pointless error message to an assert(), (continued)
- [PULL 01/18] hw/mips/fuloong2e: Convert pointless error message to an assert(), Laurent Vivier, 2020/09/11
- [PULL 07/18] Makefile: Skip the meson subdir in cscope/TAGS/ctags, Laurent Vivier, 2020/09/11
- [PULL 11/18] kconfig: fix comment referring to old Makefiles, Laurent Vivier, 2020/09/11
- [PULL 12/18] hw: hyperv: vmbus: Fix 32bit compilation, Laurent Vivier, 2020/09/11
- [PULL 14/18] target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken(), Laurent Vivier, 2020/09/11
- [PULL 15/18] hw/arm/pxa2xx: Add missing fallthrough comment, Laurent Vivier, 2020/09/11
- [PULL 18/18] target/i386/kvm: Add missing fallthrough comment, Laurent Vivier, 2020/09/11
- [PULL 13/18] test-vmstate: remove unnecessary code in match_interval_mapping_node, Laurent Vivier, 2020/09/11
- [PULL 10/18] meson.build: tweak sdl-image error message, Laurent Vivier, 2020/09/11
- [PULL 17/18] util/hexdump: Reorder qemu_hexdump() arguments, Laurent Vivier, 2020/09/11
- [PULL 16/18] util/hexdump: Convert to take a void pointer argument,
Laurent Vivier <=
- Re: [PULL 00/18] Trivial branch for 5.2 patches, Peter Maydell, 2020/09/12