aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hw/dma/xlnx_dpdma.c2
-rw-r--r--hw/net/fsl_etsec/etsec.c2
-rw-r--r--hw/net/fsl_etsec/rings.c2
-rw-r--r--hw/sd/sd.c2
-rw-r--r--hw/usb/redirect.c2
-rw-r--r--include/qemu-common.h4
-rw-r--r--net/colo-compare.c24
-rw-r--r--net/net.c2
-rw-r--r--util/hexdump.c4
-rw-r--r--util/iov.c2
10 files changed, 23 insertions, 23 deletions
diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c
index d75a806..967548a 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(desc, stdout, "", sizeof(DPDMADescriptor));
+ qemu_hexdump(stdout, "", desc, sizeof(DPDMADescriptor));
}
}
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index 5c40303..93886bb 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(buf, stderr, "", size);
+ qemu_hexdump(stderr, "", buf, size);
#endif
/* Flush is unnecessary as are already in receiving path */
etsec->need_flush = false;
diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
index 337a55f..628648a 100644
--- a/hw/net/fsl_etsec/rings.c
+++ b/hw/net/fsl_etsec/rings.c
@@ -269,7 +269,7 @@ static void process_tx_bd(eTSEC *etsec,
#if defined(HEX_DUMP)
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 */
if (etsec->first_bd.flags & BD_TX_TOEUN) {
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 1c8f852..0012882 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1785,7 +1785,7 @@ send_response:
}
#ifdef DEBUG_SD
- qemu_hexdump(response, stderr, "Response", rsplen);
+ qemu_hexdump(stderr, "Response", response, rsplen);
#endif
return rsplen;
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 09edb0d..48f38d3 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(data, stderr, desc, len);
+ qemu_hexdump(stderr, desc, data, len);
}
/*
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 6834883..9cfd626 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -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
*/
-void qemu_hexdump(const void *bufptr, FILE *fp,
- const char *prefix, size_t size);
+void qemu_hexdump(FILE *fp, const char *prefix,
+ const void *bufptr, size_t size);
/*
* helper to parse debug environment variables
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 550272b..4a5ed64 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -494,10 +494,10 @@ sec:
g_queue_push_head(&conn->secondary_list, spkt);
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
- qemu_hexdump(ppkt->data, stderr,
- "colo-compare ppkt", ppkt->size);
- qemu_hexdump(spkt->data, stderr,
- "colo-compare spkt", spkt->size);
+ qemu_hexdump(stderr, "colo-compare ppkt",
+ ppkt->data, ppkt->size);
+ qemu_hexdump(stderr, "colo-compare spkt",
+ spkt->data, spkt->size);
}
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("Secondary pkt size", spkt->size);
if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
- qemu_hexdump(ppkt->data, stderr, "colo-compare pri pkt",
- ppkt->size);
- qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt",
- spkt->size);
+ qemu_hexdump(stderr, "colo-compare pri pkt",
+ ppkt->data, ppkt->size);
+ qemu_hexdump(stderr, "colo-compare sec pkt",
+ spkt->data, spkt->size);
}
return -1;
} else {
@@ -578,10 +578,10 @@ 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(ppkt->data, stderr, "colo-compare pri pkt",
- ppkt->size);
- qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt",
- spkt->size);
+ qemu_hexdump(stderr, "colo-compare pri pkt",
+ ppkt->data, ppkt->size);
+ qemu_hexdump(stderr, "colo-compare sec pkt",
+ spkt->data, spkt->size);
}
return -1;
} else {
diff --git a/net/net.c b/net/net.c
index f3e5d53..7a2a0fb 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(buf, stdout, "net", size);
+ qemu_hexdump(stdout, "net", buf, size);
#endif
if (sender->link_down || !sender->peer) {
diff --git a/util/hexdump.c b/util/hexdump.c
index 053f05d..0b4662e 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -16,8 +16,8 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-void qemu_hexdump(const void *bufptr, FILE *fp,
- const char *prefix, size_t size)
+void qemu_hexdump(FILE *fp, const char *prefix,
+ const void *bufptr, size_t size)
{
const char *buf = bufptr;
unsigned int b, len, i, c;
diff --git a/util/iov.c b/util/iov.c
index 45ef304..ae61d69 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -237,7 +237,7 @@ void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt,
size = size > limit ? limit : size;
buf = g_malloc(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);
}
generated by cgit v1.1 at 2024-12-25 17:50:16 +0000