util/hexdump: Reorder qemu_hexdump() arguments
qemu_hexdump()'s pointer to the buffer and length of the buffer are closely related arguments but are widely separated in the argument list order (also, the format of <stdio.h> function prototypes is usually to have the FILE* argument coming first). Reorder the arguments as "fp, prefix, buf, size" which is more logical. Suggested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Message-Id: <20200822180950.1343963-3-f4bug@amsat.org> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
parent
67263b33af
commit
b42581f5bb
|
@ -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(desc, stdout, "", sizeof(DPDMADescriptor));
|
qemu_hexdump(stdout, "", desc, sizeof(DPDMADescriptor));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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(buf, stderr, "", size);
|
qemu_hexdump(stderr, "", buf, 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;
|
||||||
|
|
|
@ -269,7 +269,7 @@ static void process_tx_bd(eTSEC *etsec,
|
||||||
|
|
||||||
#if defined(HEX_DUMP)
|
#if defined(HEX_DUMP)
|
||||||
qemu_log("eTSEC Send packet size:%d\n", etsec->tx_buffer_len);
|
qemu_log("eTSEC Send packet size:%d\n", etsec->tx_buffer_len);
|
||||||
qemu_hexdump(etsec->tx_buffer, stderr, "", etsec->tx_buffer_len);
|
qemu_hexdump(stderr, "", etsec->tx_buffer, etsec->tx_buffer_len);
|
||||||
#endif /* ETSEC_RING_DEBUG */
|
#endif /* ETSEC_RING_DEBUG */
|
||||||
|
|
||||||
if (etsec->first_bd.flags & BD_TX_TOEUN) {
|
if (etsec->first_bd.flags & BD_TX_TOEUN) {
|
||||||
|
|
|
@ -1785,7 +1785,7 @@ send_response:
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG_SD
|
#ifdef DEBUG_SD
|
||||||
qemu_hexdump(response, stderr, "Response", rsplen);
|
qemu_hexdump(stderr, "Response", response, rsplen);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return rsplen;
|
return rsplen;
|
||||||
|
|
|
@ -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(data, stderr, desc, len);
|
qemu_hexdump(stderr, desc, data, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -138,8 +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 void *bufptr, FILE *fp,
|
void qemu_hexdump(FILE *fp, const char *prefix,
|
||||||
const char *prefix, size_t size);
|
const void *bufptr, size_t size);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* helper to parse debug environment variables
|
* helper to parse debug environment variables
|
||||||
|
|
|
@ -494,10 +494,10 @@ 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(ppkt->data, stderr,
|
qemu_hexdump(stderr, "colo-compare ppkt",
|
||||||
"colo-compare ppkt", ppkt->size);
|
ppkt->data, ppkt->size);
|
||||||
qemu_hexdump(spkt->data, stderr,
|
qemu_hexdump(stderr, "colo-compare spkt",
|
||||||
"colo-compare spkt", spkt->size);
|
spkt->data, spkt->size);
|
||||||
}
|
}
|
||||||
|
|
||||||
colo_compare_inconsistency_notify(s);
|
colo_compare_inconsistency_notify(s);
|
||||||
|
@ -535,10 +535,10 @@ 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(ppkt->data, stderr, "colo-compare pri pkt",
|
qemu_hexdump(stderr, "colo-compare pri pkt",
|
||||||
ppkt->size);
|
ppkt->data, ppkt->size);
|
||||||
qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt",
|
qemu_hexdump(stderr, "colo-compare sec pkt",
|
||||||
spkt->size);
|
spkt->data, spkt->size);
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -578,10 +578,10 @@ 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(ppkt->data, stderr, "colo-compare pri pkt",
|
qemu_hexdump(stderr, "colo-compare pri pkt",
|
||||||
ppkt->size);
|
ppkt->data, ppkt->size);
|
||||||
qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt",
|
qemu_hexdump(stderr, "colo-compare sec pkt",
|
||||||
spkt->size);
|
spkt->data, spkt->size);
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -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(buf, stdout, "net", size);
|
qemu_hexdump(stdout, "net", buf, size);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (sender->link_down || !sender->peer) {
|
if (sender->link_down || !sender->peer) {
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
|
|
||||||
void qemu_hexdump(const void *bufptr, FILE *fp,
|
void qemu_hexdump(FILE *fp, const char *prefix,
|
||||||
const char *prefix, size_t size)
|
const void *bufptr, size_t size)
|
||||||
{
|
{
|
||||||
const char *buf = bufptr;
|
const char *buf = bufptr;
|
||||||
unsigned int b, len, i, c;
|
unsigned int b, len, i, c;
|
||||||
|
|
|
@ -237,7 +237,7 @@ void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt,
|
||||||
size = size > limit ? limit : size;
|
size = size > limit ? limit : size;
|
||||||
buf = g_malloc(size);
|
buf = g_malloc(size);
|
||||||
iov_to_buf(iov, iov_cnt, 0, buf, size);
|
iov_to_buf(iov, iov_cnt, 0, buf, size);
|
||||||
qemu_hexdump(buf, fp, prefix, size);
|
qemu_hexdump(fp, prefix, buf, size);
|
||||||
g_free(buf);
|
g_free(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue