From 3568ac2a6e6df89cea52a56f70b95af9e1251bbd Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Thu, 16 May 2013 11:32:28 -0400 Subject: 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 Reviewed-by: Paolo Bonzini Message-id: 1368718348-15199-1-git-send-email-emaste@freebsd.org Signed-off-by: Anthony Liguori --- util/hexdump.c | 2 +- util/iov.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'util') 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); } -- cgit v1.2.3