diff options
| author | Ed Maste | 2013-05-16 17:32:28 +0200 |
|---|---|---|
| committer | Michael Tokarev | 2013-05-18 14:35:12 +0200 |
| commit | 3a8ae21bd07e8a02e6e2eb4896790a62f979acda (patch) | |
| tree | 996e59913413d78e46fb340fb3b1eff243cd7667 /hw | |
| parent | remove some double-includes (diff) | |
| download | qemu-3a8ae21bd07e8a02e6e2eb4896790a62f979acda.tar.gz qemu-3a8ae21bd07e8a02e6e2eb4896790a62f979acda.tar.xz qemu-3a8ae21bd07e8a02e6e2eb4896790a62f979acda.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>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw')
| -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; |