diff options
| author | Ed Maste <emaste@freebsd.org> | 2013-05-16 11:32:28 -0400 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-20 08:20:08 -0500 |
| commit | 3568ac2a6e6df89cea52a56f70b95af9e1251bbd (patch) | |
| tree | 40bd6cfd8072dc1dbedee93799123d1f2bfde90c /hw/dma/pl330.c | |
| parent | fd2a2e1c552cb47ca196552457e175c889b58478 (diff) | |
| download | focaccia-qemu-3568ac2a6e6df89cea52a56f70b95af9e1251bbd.tar.gz focaccia-qemu-3568ac2a6e6df89cea52a56f70b95af9e1251bbd.zip | |
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 'hw/dma/pl330.c')
| -rw-r--r-- | hw/dma/pl330.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index 8b33138f30..60f5299e10 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; |