aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorEd Maste <emaste@freebsd.org>2013-05-16 11:32:28 -0400
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-20 08:20:08 -0500
commit3568ac2a6e6df89cea52a56f70b95af9e1251bbd (patch)
tree40bd6cfd8072dc1dbedee93799123d1f2bfde90c /util
parentfd2a2e1c552cb47ca196552457e175c889b58478 (diff)
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: Ed Maste <emaste@freebsd.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1368718348-15199-1-git-send-email-emaste@freebsd.org Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'util')
-rw-r--r--util/hexdump.c2
-rw-r--r--util/iov.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/util/hexdump.c b/util/hexdump.c
index 0d0efc86de..969b3406c0 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -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;
diff --git a/util/iov.c b/util/iov.c
index 78bbbe12d0..cc6e837c83 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -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);
}