From patchwork Thu Apr 25 18:28:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Maste X-Patchwork-Id: 239575 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C30972C00C6 for ; Fri, 26 Apr 2013 04:28:31 +1000 (EST) Received: from localhost ([::1]:59766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVQuD-0005pC-FG for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2013 14:28:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVQts-0005dT-AM for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:28:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVQtn-00042J-B9 for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:28:08 -0400 Received: from [216.171.111.232] (port=46882 helo=freebsd.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVQtn-000423-4u for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:28:03 -0400 Received: from emaste (uid 1001) (envelope-from emaste@freebsd.org) id 9dbed by freebsd.org (DragonFly Mail Agent 1); Thu, 25 Apr 2013 14:28:02 -0400 From: Ed Maste To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2013 14:28:01 -0400 Message-Id: <1366914481-12219-1-git-send-email-emaste@freebsd.org> X-Mailer: git-send-email 1.7.11.5 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 216.171.111.232 Cc: Ed Maste Subject: [Qemu-devel] [PATCH] Rename hexdump to avoid FreeBSD libutil conflict X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On FreeBSD libutil is used for openpty(), but it also provides a hexdump() which conflicts with QEMU's. Signed-off-by: Ed Maste --- hw/dma/pl330.c | 4 ++-- include/qemu-common.h | 2 +- util/hexdump.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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; diff --git a/include/qemu-common.h b/include/qemu-common.h index a39cdba..0822e47 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -449,7 +449,7 @@ int mod_utf8_codepoint(const char *s, size_t n, char **end); * Hexdump a buffer to a file. An optional string prefix is added to every line */ -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); /* vector definitions */ #ifdef __ALTIVEC__ diff --git a/util/hexdump.c b/util/hexdump.c index 0d0efc8..969b340 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;