util/hexdump: Convert to take a void pointer argument

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>
This commit is contained in:
Philippe Mathieu-Daudé 2020-08-22 20:09:49 +02:00 committed by Laurent Vivier
parent 5ace4cc0e8
commit 67263b33af
8 changed files with 16 additions and 13 deletions

View File

@ -388,7 +388,7 @@ static void xlnx_dpdma_dump_descriptor(DPDMADescriptor *desc)
{ {
if (DEBUG_DPDMA) { if (DEBUG_DPDMA) {
qemu_log("DUMP DESCRIPTOR:\n"); qemu_log("DUMP DESCRIPTOR:\n");
qemu_hexdump((char *)desc, stdout, "", sizeof(DPDMADescriptor)); qemu_hexdump(desc, stdout, "", sizeof(DPDMADescriptor));
} }
} }

View File

@ -357,7 +357,7 @@ static ssize_t etsec_receive(NetClientState *nc,
#if defined(HEX_DUMP) #if defined(HEX_DUMP)
fprintf(stderr, "%s receive size:%zd\n", nc->name, size); fprintf(stderr, "%s receive size:%zd\n", nc->name, size);
qemu_hexdump((void *)buf, stderr, "", size); qemu_hexdump(buf, stderr, "", size);
#endif #endif
/* Flush is unnecessary as are already in receiving path */ /* Flush is unnecessary as are already in receiving path */
etsec->need_flush = false; etsec->need_flush = false;

View File

@ -1785,7 +1785,7 @@ send_response:
} }
#ifdef DEBUG_SD #ifdef DEBUG_SD
qemu_hexdump((const char *)response, stderr, "Response", rsplen); qemu_hexdump(response, stderr, "Response", rsplen);
#endif #endif
return rsplen; return rsplen;

View File

@ -240,7 +240,7 @@ static void usbredir_log_data(USBRedirDevice *dev, const char *desc,
if (dev->debug < usbredirparser_debug_data) { if (dev->debug < usbredirparser_debug_data) {
return; return;
} }
qemu_hexdump((char *)data, stderr, desc, len); qemu_hexdump(data, stderr, desc, len);
} }
/* /*

View File

@ -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 * 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 * helper to parse debug environment variables

View File

@ -494,9 +494,9 @@ sec:
g_queue_push_head(&conn->secondary_list, spkt); g_queue_push_head(&conn->secondary_list, spkt);
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) { 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); "colo-compare ppkt", ppkt->size);
qemu_hexdump((char *)spkt->data, stderr, qemu_hexdump(spkt->data, stderr,
"colo-compare spkt", spkt->size); "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("primary pkt size", ppkt->size);
trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size); trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size);
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) { 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); ppkt->size);
qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt", qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt",
spkt->size); spkt->size);
} }
return -1; return -1;
@ -578,9 +578,9 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
trace_colo_compare_icmp_miscompare("Secondary pkt size", trace_colo_compare_icmp_miscompare("Secondary pkt size",
spkt->size); spkt->size);
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) { 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); ppkt->size);
qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt", qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt",
spkt->size); spkt->size);
} }
return -1; return -1;

View File

@ -636,7 +636,7 @@ static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender,
#ifdef DEBUG_NET #ifdef DEBUG_NET
printf("qemu_send_packet_async:\n"); printf("qemu_send_packet_async:\n");
qemu_hexdump((const char *)buf, stdout, "net", size); qemu_hexdump(buf, stdout, "net", size);
#endif #endif
if (sender->link_down || !sender->peer) { if (sender->link_down || !sender->peer) {

View File

@ -16,8 +16,10 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.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; unsigned int b, len, i, c;
for (b = 0; b < size; b += 16) { for (b = 0; b < size; b += 16) {