提交 3a8ae21b 编写于 作者: E Ed Maste 提交者: Michael Tokarev

Rename hexdump to avoid FreeBSD libutil conflict

On FreeBSD libutil is used for openpty(), but it also provides a hexdump()
which conflicts with QEMU's.
Signed-off-by: NEd Maste <emaste@freebsd.org>
Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
上级 997aba8e
......@@ -1157,7 +1157,7 @@ static int pl330_exec_cycle(PL330Chan *channel)
if (PL330_ERR_DEBUG > 1) {
DB_PRINT("PL330 read from memory @%08x (size = %08x):\n",
q->addr, len);
hexdump((char *)buf, stderr, "", len);
qemu_hexdump((char *)buf, stderr, "", len);
}
fifo_res = pl330_fifo_push(&s->fifo, buf, len, q->tag);
if (fifo_res == PL330_FIFO_OK) {
......@@ -1189,7 +1189,7 @@ static int pl330_exec_cycle(PL330Chan *channel)
if (PL330_ERR_DEBUG > 1) {
DB_PRINT("PL330 read from memory @%08x (size = %08x):\n",
q->addr, len);
hexdump((char *)buf, stderr, "", len);
qemu_hexdump((char *)buf, stderr, "", len);
}
if (q->inc) {
q->addr += len;
......
......@@ -443,7 +443,7 @@ int mod_utf8_codepoint(const char *s, size_t n, char **end);
* Hexdump a buffer to a file. An optional string prefix is added to every line
*/
void hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
/* vector definitions */
#ifdef __ALTIVEC__
......
......@@ -15,7 +15,7 @@
#include "qemu-common.h"
void hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)
void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)
{
unsigned int b;
......
......@@ -225,7 +225,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);
hexdump(buf, fp, prefix, size);
qemu_hexdump(buf, fp, prefix, size);
g_free(buf);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册