Commit 3568ac2a authored by Ed Maste's avatar Ed Maste Committed by Anthony Liguori
Browse files

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: default avatarEd Maste <emaste@freebsd.org>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1368718348-15199-1-git-send-email-emaste@freebsd.org
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent fd2a2e1c

hw/dma/pl330.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/qemu-common.h

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,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__

util/hexdump.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

util/iov.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}