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 --- hw/dma/pl330.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw') diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index 8b33138..60f5299 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -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; -- cgit v1.1